# Version Control (Git + GitHub for Unity) **Target:** Unity **6000.5+**. This is the full Pipelines deep dive for version control. It does **not** replace the lighter quickstarts — start there if you only need a first repo, then come back here for LFS, Smart Merge, and team workflows. > [!note] Verification status > Docs and config snippets below were checked against official Unity, GitHub, and git-lfs documentation (URLs cited in each part). **Merge-tool paths, `git lfs` install, and Editor preferences were not run live on Enceladus for this write-up.** Confirm the `UnityYAMLMerge.exe` path against your installed Editor version under Unity Hub before committing mergetool config. ## Quickstarts (lighter siblings) - [[Setting Up GitHub for Unity]] — new project → GitHub - [[Connecting an Existing Unity Project to a New GitHub Repository Using GitHub Desktop]] — existing project → Desktop publish ## Parts | # | Note | Covers | |---|---|---| | 1 | [[1. Serialization Meta and Gitignore]] | Force Text, Visible Meta Files, what to commit / ignore | | 2 | [[2. Git LFS]] | Which assets, `.gitattributes`, lock vs unlock caveats | | 3 | [[3. UnityYAMLMerge Smart Merge]] | Windows paths, `.gitconfig` mergetool, fallbacks | | 4 | [[4. Conflicts Prefabs and Branching]] | Scene/prefab conflict strategy, Prefab isolation, solo/small-team branches | | 5 | [[5. Clients and UVCS Comparison]] | Desktop vs CLI vs IDE; Git+GitHub vs Unity Version Control | | 6 | [[6. Pitfalls]] | Library committed, meta mismatches, LFS bandwidth, binary thrash | ## Related (existing) - [[Architecture and Code Patterns]] — asmdefs and structure that keep diffs reviewable - [[Custom Inspectors and Editor Tooling]] — Editor-only folders and tooling that stay out of players - [[SceneManagement in Unity 6]] — additive scenes / load patterns that reduce scene-file contention - [[Game Programming Patterns (Review)]] — patterns that keep gameplay data out of monolithic scenes - [[Level Up! (Review)]] — briefly relevant if you version GDD / design paperwork beside the project ## Related future Pipelines topics Build/CI automation and Addressables content pipelines are planned separately — mention only; no notes linked yet. ## Official docs (hub index) - Unity Version Control overview: https://docs.unity3d.com/6000.5/Documentation/Manual/VersionControl.html - Smart merge / UnityYAMLMerge (6000.5): https://docs.unity3d.com/6000.5/Documentation/Manual/SmartMerge.html - Smart merge (Hub path + Git setup, newer manual): https://docs.unity.com/en-us/engine/7000.0/manual/get-started/project-configuration/version-control/smart-merge - Unity Version Control (UVCS, formerly Plastic SCM): https://docs.unity.com/en-us/unity-version-control - UVCS Smart Locks: https://docs.unity.com/en-us/unity-version-control/smart-locks - GitHub Unity `.gitignore` template: https://github.com/github/gitignore/blob/main/Unity.gitignore - GitHub large files / LFS: https://docs.github.com/en/repositories/working-with-files/managing-large-files/about-large-files-on-github - Configuring Git LFS: https://docs.github.com/en/repositories/working-with-files/managing-large-files/configuring-git-large-file-storage - About Git LFS: https://docs.github.com/en/repositories/working-with-files/managing-large-files/about-git-large-file-storage - git-lfs project: https://git-lfs.com/ ## See also (hands-on UVCS) - [[UVCS]] — hands-on Unity Version Control (Dashboard, Plastic vs Gluon, checkin, Smart Locks, desktop client) ## See also (added 2026-11-10) - [[Unity Test Framework]] - [[Build Automation and CI]] - [[Addressables]]