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/6b5165bb57706ebb35eb4c600604b42a Everything - https://www.voidtools.com/support/everything/ P4 Merge - https://www.perforce.com/products/helix-core-apps/merge-diff-tool-p4merge Git Worktree Runner - https://github.com/coderabbitai/git-worktree-runner Git Worktree Runner for AI - https://dev.to/webdeveloperhyper/how-to-run-ai-in-parallel-easily-and-for-free-git-worktree-runner-80o Unity YAML Merge Docs - https://docs.unity3d.com/Manual/SmartMerge.html 🔔 Subscribe for more Unity Tutorials https://youtube.com/@git-amend Discord: https://discord.gg/FDRZGQBBUC #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=repositories Unity Utility Library: https://github.com/adammyhre/Unity-Utils Fuzzy Match Component Copier: https://github.com/adammyhre/Unity-Fuzzy-Component-Copier Lock Inspector Hotkey: https://gist.github.com/adammyhre/4754f731a93bf1cab0d1385ccfa23642 *Other Recommended Tools* _(Affiliate Links)_ Universal Animations and Modular Fantasy Outfits (ON SALE) - https://quaternius.itch.io/ Eole Grass Shader - https://assetstore.unity.com/publishers/24904?aid=1101lw3sv Wingman - https://assetstore.unity.com/packages/tools/utilities/wingman-your-inspector-s-best-friend-303181?aid=1101lw3sv Favorites Window - https://assetstore.unity.com/packages/tools/utilities/favorites-window-123487?aid=1101lw3sv Logwin - https://assetstore.unity.com/packages/tools/utilities/logwin-log-debug-values-tracker-149558?aid=1101lw3sv TimeScale Toolbar - https://assetstore.unity.com/packages/tools/utilities/timescale-toolbar-291564?aid=1101lw3sv Scene Notes - https://assetstore.unity.com/publishers/87819?aid=1101lw3sv Beautify - https://assetstore.unity.com/packages/vfx/shaders/fullscreen-camera-effects/beautify-3-advanced-post-processing-233073?aid=1101lw3sv Odin - https://assetstore.unity.com/packages/tools/utilities/odin-inspector-and-serializer-89041?aid=1101lw3sv?aid=1101lw3sv Odin Validator - https://assetstore.unity.com/packages/tools/utilities/odin-validator-227861?aid=1101lw3sv Hot Reload: https://assetstore.unity.com/packages/tools/utilities/hot-reload-edit-code-without-compiling-254358?aid=1101lw3sv Better Hierarchy: https://assetstore.unity.com/packages/tools/utilities/better-hierarchy-272963?aid=1101lw3sv Better Transform: https://assetstore.unity.com/packages/tools/utilities/better-transform-size-notes-global-local-workspace-child-parent--276554?aid=1101lw3sv Better Mesh Filter: https://assetstore.unity.com/packages/tools/utilities/better-mesh-filter-266489?aid=1101lw3sv Editor Console Pro: https://assetstore.unity.com/packages/tools/utilities/editor-console-pro-11889?aid=1101lw3sv Any Object Finder: https://assetstore.unity.com/packages/tools/utilities/any-object-finder-286455?aid=1101lw3sv Kybernetic Tools: https://assetstore.unity.com/publishers/16747?aid=1101lw3sv Sisus Tools: https://assetstore.unity.com/publishers/41398?aid=1101lw3sv Prime Tween - https://assetstore.unity.com/packages/tools/animation/primetween-high-performance-animations-and-sequences-252960?aid=1101lw3s Rabbit Logger - https://assetstore.unity.com/packages/tools/utilities/rabbit-logger-305396?aid=1101lw3s *Follow me!* https://linktr.ee/gitamend