MergeSight
Get MergeSight

Unity Editor extension for Git review, semantic diff, and 3-way merge workflows

MergeSight

Review & Merge Unity Assets

Understand changes. Merge without fear.

Semantic Review 3-Way Merge CLI Automation
Get MergeSight View Documentation
Unity-native understanding See changes the way Unity sees them.
Safe by design Preview, validate, backup. Only then apply.
Automate with CLI CI checks, merge drivers, and VCS integrations.

Built for Unity teams. Works with Git.

MergeSight semantic Unity asset review interface

The Problem

Unity assets were not made for raw text review.

Git sees YAML lines. Unity teams need objects, components, hierarchy, references, and property changes.

Noisy YAML

Large text diffs hide intent.

Risky conflicts

Manual edits can break assets.

Missing context

Unity structure is hard to see.

CI needs checks

Automation needs deterministic output.

Assets/Game/Scenes/MainPreview.unity

GameObject &1001object identity
156--- !u!1 &1001
157GameObject:
158 m_ObjectHideFlags: 0
159 m_CorrespondingSourceObject: {fileID: 0}reference
160- m_Name: Main Camera
160+ m_Name: Camerarename
161 m_TagString: MainCamera
164- m_StaticEditorFlags: 0
164+ m_StaticEditorFlags: 1flags
165... unrelated serialized fields ...
Camera component &2050split block
243--- !u!20 &2050
244Camera:
246 m_CorrespondingSourceObject: {fileID: 1001}source
249 m_GameObject: {fileID: 1001}attached
251- m_FieldOfView: 60
251+ m_FieldOfView: 45property
252 m_NearClipPlane: 0.3
253 m_FarClipPlane: 1000

Real scene refactoring with major hierarchy reshaping: in raw YAML, moved nodes, reordered children, and property edits blend into noisy text blocks.

Hierarchy

Raw lines do not show where the object sits.

WorldEnvironmentCamera

References

fileID links are hard to validate by eye.

fileID 1001GameObject

Properties

Values change without showing Unity intent.

FOV 60FOV 45

Components

One Unity change is split across blocks.

GameObjectCamera

Powerful by design

One tool for reviewing, resolving, and automating Unity asset changes.

MergeSight covers the full path from understanding a Unity asset change to safely applying merge decisions.

Semantic Review

See Unity changes in Unity terms.

Review scenes, prefabs, hierarchy, components, references, and Git context without reading raw YAML.

  • Changed asset browserJump straight to scenes, prefabs, and modified asset files.
  • Semantic diff treeInspect GameObjects, components, properties, references, and hierarchy.
  • Git comparison modesCompare branches, commits, and working tree changes in one view.
  • Filters and searchFocus by asset type, path, Git status, and change density.
  • Review exportsShare Markdown or JSON summaries with your team.
MergeSight semantic review of changed Unity scene assets
Only changed Unity assetsStart from scenes and prefabs that actually changed.
Filter by review scopeUse type, status, path, and most-changed sorting.
Branch and commit contextKeep source revisions visible while reviewing changes.

3-Way Merge

Resolve conflicts with context.

Choose Base, Ours, or Theirs at the right level, preview the result, and apply only when every required decision is resolved and validated.

  • Base / Ours / TheirsCompare changes side-by-side with full Unity context.
  • Conflict classificationAutomatically classify conflicts and highlight risk.
  • Auto-resolve safeApply safe decisions automatically, then review the rest.
  • Preview before applySee the exact result before writing any changes.
  • Backup and validationBack up originals and validate after merge.
MergeSight 3-way merge workflow preview
Nodes tracked: 8 Conflicts: 3 Auto-resolved: 5 Unresolved: 3

CLI Automation

Merge checks for CI pipelines

Use the packaged .NET CLI for fast CI checks, semantic merge artifacts, Git merge-driver mode, and external VCS merge-tool wrappers.

  • CI checksinspect, check, auto-plan, validate-plan
  • Git merge-driversemantic safe decisions from Git workflows
  • VCS wrappersfile-based merge flows for external clients
Packaged .NET CLI
CI ready
Libraries/StandaloneCLI/bin/mergesight.dll

Run

$ dotnet Libraries/StandaloneCLI/bin/mergesight.dll check

Run CI-safe validation over Unity text assets and fail when unresolved or unsafe merge state is detected.

merge-check.json exit code 0

Workflow

From raw Unity YAML to a merge you can trust.

MergeSight turns text-serialized Unity assets into a structured review flow, keeps risky decisions explicit, and writes only after preview and validation.

01

Analyze Unity YAML

Parse asset files into stable Unity identities.

104--- !u!1 &381924
105GameObject:
-m_Name: EnemySpawner
+m_Name: WaveSpawner
131m_Component:
+- component: {fileID: 99172}
148m_LocalPosition: {x: 4, y: 0, z: 2}
02

Review in Unity structure

See objects, components, hierarchy, and properties.

S
SampleScene.unityscene root
changed
G
WaveSpawnerGameObject renamed
rename
C
EnemyWaveControllercomponent added
add
P
Transform.positionx changed from 2 to 4
03

Preview and apply safely

Validate the result before writing changed files.

OK
Safe decisionsAuto-resolved when intent is unambiguous.
5
!
Needs reviewAmbiguous conflicts stay visible.
3
->
Preview, backup, validateApply only after the merge result checks out.
ready

Supported assets and requirements

MergeSight is an Editor and automation workflow for Unity projects using text serialization.

Primary support

Primary support covers these text-serialized Unity asset types.

.unity .prefab .asset .mat

Additional VCS wrapper templates can include patterns for .physicMaterial, .anim, .controller, and .overrideController.

Requirements

  • Unity project using text serialization for assets.
  • Git workflows require Git access from the project checkout.
  • Standalone CLI usage requires a compatible .NET runtime.
  • Intended for Editor and automation workflows, not runtime builds.

Feature matrix

Area Capability Why it matters
Review Semantic diff tree Understand object-level changes quickly.
Review Branch/commit compare Review Unity changes across real Git workflows.
Review Export summaries Share readable change reports with your team.
Merge 3-way conflict model Resolve Base/Ours/Theirs with Unity context.
Merge Auto-resolve safe Let the tool handle only proven safe decisions.
Merge Preview and validation Write only after the result is ready.
CLI CI checks Detect unresolved Unity asset merges in automation.
CLI Git merge-driver mode Use semantic auto-safe merging from Git.
VCS Wrapper templates Adapt file-based workflows for common VCS clients.

FAQ

Does MergeSight work at runtime?

No. MergeSight is an Editor and automation tool. It is not a runtime package and is not intended to ship in player builds.

Does it require a web service?

No. Core review and merge features run locally.

Can it resolve every merge conflict automatically?

No. MergeSight is safety-oriented. It can auto-resolve safe cases, but ambiguous or unsupported conflicts require explicit user decisions or manual cleanup.

Which asset types are supported?

Primary support covers .unity, .prefab, .asset, and .mat text-serialized Unity assets.

Can it integrate with Perforce or Unity Version Control?

Git setup is available in the Editor wizard. Perforce, Unity Version Control / Plastic SCM, SVN, and generic clients are supported through wrapper templates and external client configuration guidance.

Is there a standalone desktop merge tool?

No. MergeSight includes the Unity Editor UI and a standalone .NET CLI library, but not a separate desktop mergetool app.

Get MergeSight when the Asset Store release is ready.

Leave your email to receive launch news, documentation updates, and availability details for MergeSight.

Short form, no spam. We will only send launch-relevant updates.