Search Unity

  1. Megacity Metro Demo now available. Download now.
    Dismiss Notice
  2. Unity support for visionOS is now available. Learn more in our blog post.
    Dismiss Notice

Anyone else have issues with Git?

Discussion in 'Formats & External Tools' started by evan_ohara, Dec 7, 2016.

  1. evan_ohara

    evan_ohara

    Joined:
    Oct 28, 2016
    Posts:
    35
    I am not positive if it's git, or the way I'm using it... but I ran into an issue where I could not open one of my scenes (the editor would freeze). I saved a hard separate backup before employing git in unity that I've gone back to. Are there any nuances related to the combination of Git and unity that I should pay attention to?
     
  2. Kylotan

    Kylotan

    Joined:
    Feb 17, 2011
    Posts:
    212
    If you're using branching, or working as part of a team, it's possible that Git has attempted to auto-merge a file that is not suitable for merging. If this is the case, how to fix it will depend on the file type.

    You might also be attempting to store files that shouldn't really be in Git - if you're not already using a .gitignore file, add one. (Do a search for 'unity .gitignore' to find some examples.)