Version - Control Unity
in your repo:
git lfs track "*.psd" git lfs track "*.fbx" git lfs track "*.unity" git lfs track "*.prefab" git lfs track "*.asset" git add .gitattributes ⚠️ Without LFS, your repo will bloat and clones will take forever. Avoid long-lived branches – merging scenes is still painful. version control unity
git config merge.unity.name "Unity SmartMerge" git config merge.unity.driver "/path/to/Unity/YamlMerge" | Step | Action | |------|--------| | 1 | git pull + update scene/asset locks | | 2 | Make small, focused changes | | 3 | Test in Unity (no compile errors) | | 4 | git add + meaningful commit message | | 5 | git pull --rebase then git push | | 6 | Resolve conflicts immediately (use UnityYamlMerge) | in your repo: git lfs track "*