MergeSight for Unity Version Control
Use MergeSight with Unity Version Control to review changesets, inspect Unity asset changes semantically, and resolve 3-way scene or prefab conflicts.
Unity Workflow Guides
Unity version control, asset review, and merge guides
Practical guides for Git, Unity Version Control, Perforce, scenes, prefabs, materials, semantic diff, merge conflicts, team collaboration, and CI. Start with the workflow you need, then follow the linked implementation and troubleshooting guides.
Unity Version Control
Unity Version Control workflows
Changesets, scene and prefab review, conflict resolution, and role-specific UVCS guidance.
How to Resolve Unity Version Control Merge Conflicts
Resolve Unity Version Control merge conflicts with a safe Base, source, and destination workflow for Unity scenes, prefabs, and serialized assets.
How to Compare Unity Scenes Between UVCS Changesets
Compare Unity scenes between UVCS changesets with cm diff, then review hierarchy, GameObjects, properties, references, and prefab changes semantically.
How to Review Unity Prefab Changes in Unity Version Control
Review Unity prefab changes in Unity Version Control with a checklist for overrides, nested prefabs, components, references, and changeset validation.
Unity Version Control Workflow for Level Designers
A Unity Version Control workflow for level designers: update, lock high-risk assets, review scene and prefab changes, check in changesets, and validate levels.
Git Setup
Git setup for Unity teams
Repository boundaries, attributes, LFS, locking, Smart Merge, and a reproducible team workflow.
Unity Git Setup for Teams: LFS, Smart Merge, and Asset Workflows
Set up Git for a Unity team with Force Text, visible meta files, .gitignore, Git LFS, Smart Merge, locking, review, and validation.
.gitattributes for Unity: Smart Merge, Git LFS, and File Locking
Build a Unity .gitattributes file that separates Smart Merge text assets, Git LFS binaries, line endings, and lockable files without hiding useful diffs.
Unity Git LFS: Which Assets Should Use It?
Choose which Unity assets belong in Git LFS, which should stay in normal Git, and how to avoid hiding scene, prefab, material, and meta file diffs.
Unity .gitignore: What to Commit and What to Ignore
A practical Unity .gitignore guide: commit Assets, meta files, Packages, and ProjectSettings while excluding Library, Temp, builds, logs, and local state.
How to Use Git LFS File Locking for Unity Scenes and Prefabs
Use Git LFS locks in Unity without accidentally losing scene and prefab diffs. Learn commands, lock policy, and the text-merge tradeoff.
UnityYAMLMerge Guide for Git, Scenes & Prefabs
Configure UnityYAMLMerge as a Git mergetool or automatic driver, locate the executable, troubleshoot setup, and validate merge results.
Review and History
Semantic diff and pull-request review
Compare branches, commits, changesets, scenes, prefabs, materials, and ScriptableObjects with Unity context.
How to Compare Unity Scenes Between Git Branches or Commits
Compare a Unity scene between Git branches or commits with exact diff commands, merge-base selection, semantic hierarchy review, and reference checks.
How to Review Unity Scenes and Prefabs in Pull Requests
Review Unity scenes and prefabs in pull requests with semantic diffs, ownership checks, references, prefab overrides, validation, and CI evidence.
How to Review Unity Prefab Changes in Git
Review Unity prefab changes in Git by separating hierarchy, components, nested prefab links, overrides, GUIDs, fileIDs, and reference changes.
How to Diff Unity Materials and ScriptableObject Assets
Diff Unity .mat and ScriptableObject .asset files by reviewing shader references, keywords, saved properties, fields, lists, GUIDs, and object references.
Unity Scene Diff: Raw YAML vs Semantic Review
See why raw YAML is noisy and how semantic review exposes GameObjects, components, hierarchy, references, and safer context.
Unity Prefab and Material Review for Technical Artists
A technical artist review workflow for Unity prefabs, nested sources, overrides, materials, shader keywords, saved properties, GUIDs, references, and CI evidence.
Team Collaboration
Scene ownership and parallel work
Choose locks or merge, split levels into additive scenes, and use prefabs as collaboration boundaries.
Unity Team Collaboration: How Multiple People Can Work on the Same Scene
Let multiple Unity team members work on one level safely with scene ownership, additive scenes, prefabs, short branches, semantic review, locks, and CI.
Unity File Locking vs Smart Merge: When to Lock or Merge
Choose Unity file locking or Smart Merge by asset type, serialization, overlap risk, merge cost, team size, and review requirements.
How to Split Unity Scenes for Team Collaboration
Split a Unity level into additive scenes with clear ownership for systems, environment, lighting, gameplay, and integration while reducing merge conflicts.
Prefab-First Unity Workflows for Reducing Scene Conflicts
Use prefab-first Unity workflows to move reusable and independently owned content out of shared scenes while controlling nested prefabs, variants, and overrides.
Troubleshooting
Unity merge errors and recovery
Fix conflict markers, UnityYAMLMerge errors, broken assets, scene conflicts, prefab conflicts, and references.
The File "Seems to Have Merge Conflicts" in Unity: Complete Fix Guide
Fix Unity's file seems to have merge conflicts error by locating conflict markers, restoring all Git sides, resolving safely, validating the asset, and preventing recurrence.
UnityYAMLMerge Error Reference: Not Found, Not Working, Expected Key
Troubleshoot UnityYAMLMerge not found, driver not running, exit failures, bad argument order, binary serialization, and did not find expected key parse errors.
Unity Scene or Prefab Won't Open After a Git Merge
Recover a Unity scene or prefab that will not open after Git merge by checking markers, serialization, Unity versions, YAML structure, scripts, references, and backups.
How to Resolve Unity Scene Merge Conflicts in Git
A step-by-step workflow using UnityYAMLMerge, Base/Ours/Theirs review, hierarchy and reference checks, and Unity validation.
Unity Prefab Merge Conflicts: Why They Are Hard
Nested prefabs, overrides, ownership, common conflict types, and reference changes that make prefab merges risky.
Why Unity References Break: GUIDs, Meta Files, Missing Scripts
Learn how GUIDs, meta files, fileIDs, missing scripts, missing prefabs, and stale references create failures.
VCS and Tool Selection
Choose the right Unity version-control workflow
Neutral comparisons across Git, Perforce, Unity Version Control, UnityYAMLMerge, and semantic review.
Best Version Control for Unity: Git vs Perforce vs Unity Version Control
Compare Git, Perforce, and Unity Version Control for Unity projects by branching, large assets, locking, ecosystem, administration, reviews, and merge workflows.
Unity Version Control vs Git for Scene and Prefab Workflows
Compare Unity Version Control and Git for scenes, prefabs, changesets, branches, locking, large assets, code review, CI, and Unity-aware merge workflows.
Git vs Perforce for Unity Teams
Compare Git and Perforce for Unity teams across branching, large binary assets, exclusive checkout, workspaces, code review, CI, administration, and scene merges.
UnityYAMLMerge vs MergeSight
Compare Unity Smart Merge and MergeSight for semantic review, 3-way asset conflicts, validation, and CI automation.
CI and Automation
Validate Unity assets before merge
GitHub Actions, marker guards, missing scripts, broken references, semantic reports, and merge checks.
Validate Unity Scenes and Prefabs with GitHub Actions
Validate Unity scenes and prefabs in GitHub Actions with conflict-marker scans, semantic merge checks, Unity batchmode validation, artifacts, and safe runner design.
Git Pre-Commit Hook for Unity Conflict Markers
Add a Git pre-commit hook that rejects staged Unity scenes, prefabs, materials, and asset files containing unresolved merge conflict markers.
Detect Missing Scripts and Broken References in CI
Detect missing Unity scripts, dangling GUID and fileID references, hierarchy problems, and broken prefab links in CI with semantic and Unity-hosted checks.
Generate Semantic Unity Asset Diff Reports for Pull Requests
Generate Markdown and JSON pull-request reports for Unity scene, prefab, material, and asset changes with hierarchy, properties, references, risk, and validation.
How to Add Unity Asset Merge Checks to CI
Validate Unity scenes, prefabs, references, unresolved conflicts, and risky YAML asset states before merging to main.
Unity YAML Fundamentals
Serialization, prefabs, and references
The underlying Unity YAML, GUID, fileID, nested prefab, and override concepts behind every workflow.
What Is Unity YAML? GUIDs, fileIDs & Prefabs
A direct guide to Unity text serialization, Class IDs, fileIDs, GUIDs, meta files, references, scenes, and prefab relationships.
Unity Nested Prefabs Explained: Overrides, References, and Merge Conflicts
Understand nested prefab source links, multi-level overrides, references, YAML review, and merge risks.
Unity Prefab Overrides Explained: Why Raw YAML Review Is Risky
Understand PrefabInstance modifications, property overrides, added components, nested prefab context, and review risks.