With your project open in the Unity editor:
- Edit > Project Settings > Editor
-
Make .meta files visible to avoid broken object references.
-
Version Control / Mode: “Visible Meta Files”
-
Use plain text serialization to avoid unresolvable merge conflicts.
-
Asset Serialization / Mode: “Force Text”
Save your changes. (File > Save Project)
If you’re curious, you can read more about Unity’s YAML scene format here.
.gitattributes
has been set up to enforce the proper line endings on certain file types and enables Unity's Smart Merge tool to be used on merge conflicts surrounding unity specific files.