Create a file named .gitignore in your project's root folder (the folder containing Assets , ProjectSettings , etc.). Paste this standard Unity template:
git config merge.unity.name "Unity SmartMerge" git config merge.unity.driver "/path/to/Unity/YamlMerge" version control unity
# Asset store tools (optional) /[Aa]ssets/AssetStoreTools* Create a file named
Merging scenes ( .unity files) is notoriously difficult. If two people move the same cube in a scene, Git cannot automatically merge it. version control unity
Choosing the right tool depends on your team size and project complexity. REVERT TO THE LAST VERSION OF STUDIO