Unity + Git in 2025: Smart Merge + Worktrees + Worktree Runner
In this video we're going to configure and enable Unity’s built-in Smart Merge (UnityYAMLMerge), add the .gitattributes lines that make scene and prefab merges reliable, then move to git worktrees so multiple branches can stay checked out and open at the same time without ever triggering full project re-imports. Finally we install and configure git-worktree-runner so creating, opening and cleaning up worktrees becomes a single command instead of typing paths. By the end we have a clean, fast, parallel workflow that works the same whether we’re fixing a hotfix, building a long-running feature, or just trying out ideas — all with zero broken references and zero waiting.
Want to support me? 😀
Buy me a coffee! https://ko-fi.com/adammyhre
Source code: https://gist.github.com/adammyhre/6b5...
Everything - https://www.voidtools.com/support/eve...
P4 Merge - https://www.perforce.com/products/hel...
Git Worktree Runner - https://github.com/coderabbitai/git-w...
Git Worktree Runner for AI - https://dev.to/webdeveloperhyper/how-...
Unity YAML Merge Docs - https://docs.unity3d.com/Manual/Smart...
🔔 Subscribe for more Unity Tutorials / @git-amend
Discord: / discord
#unity3d #gamedev #indiedev
▬ Contents of this video ▬▬▬▬▬▬▬▬▬▬
0:00 Setting up Smart Merge
6:54 Resolving Conflicts
11:08 Git Worktrees
14:48 Git Worktree Runner
Corrections:
5:10 Omit .asset From .gitattributes
More Useful Code:
https://github.com/adammyhre?tab=repo...
Unity Utility Library: https://github.com/adammyhre/Unity-Utils
Fuzzy Match Component Copier: https://github.com/adammyhre/Unity-Fu...
Lock Inspector Hotkey: https://gist.github.com/adammyhre/475...
Other Recommended Tools (Affiliate Links)
Universal Animations and Modular Fantasy Outfits (ON SALE) - https://quaternius.itch.io/
Eole Grass Shader - https://assetstore.unity.com/publishe...
Wingman - https://assetstore.unity.com/packages...
Favorites Window - https://assetstore.unity.com/packages...
Logwin - https://assetstore.unity.com/packages...
TimeScale Toolbar - https://assetstore.unity.com/packages...
Scene Notes - https://assetstore.unity.com/publishe...
Beautify - https://assetstore.unity.com/packages...
Odin - https://assetstore.unity.com/packages...
Odin Validator - https://assetstore.unity.com/packages...
Hot Reload: https://assetstore.unity.com/packages...
Better Hierarchy: https://assetstore.unity.com/packages...
Better Transform: https://assetstore.unity.com/packages...
Better Mesh Filter: https://assetstore.unity.com/packages...
Editor Console Pro: https://assetstore.unity.com/packages...
Any Object Finder: https://assetstore.unity.com/packages...
Kybernetic Tools: https://assetstore.unity.com/publishe...
Sisus Tools: https://assetstore.unity.com/publishe...
Prime Tween - https://assetstore.unity.com/packages...
Rabbit Logger - https://assetstore.unity.com/packages...
Follow me!
https://linktr.ee/gitamend