Conflux: Prefab Merge Tool

Conflux resolves Unity prefab merge conflicts by meaning, not by text.

When Git stops on a prefab, a text merge tool offers one side or the other, and either choice loses someone's work. Conflux reads base, ours and theirs as real prefabs, lets you pick per object, component or property, and shows the result live in Prefab Mode.

Website | Forum | Discord

See the whole merge

Ours, Merged and Theirs side by side, hierarchies and inspectors, with selection and scrolling in sync. Every change is marked by kind, and the number of real clashes left to settle sits on the toolbar.

Decide at any level

Take a whole branch, one object, one component or a single property from either side in one click. Changes only one side made are kept for you, so you only answer the questions that need you.

Check before you write

The merged prefab opens in Prefab Mode and rebuilds live as you pick. Apply lists exactly what will change in your file, can back up your version first, and reads the written file back to confirm it matches what you approved.

Built for real projects

• Nested prefabs and prefab variants, overrides and deletions included

• Object IDs kept on write, so scenes and variants that reference the prefab never break

• Reorders, reparenting and list merges handled as their own decisions

• Git, Subversion, Mercurial, Perforce and Plastic SCM, detected automatically

• Works through a whole branch merge, one conflict after another

• 16 sample conflicts to try before a real merge is waiting on you

• Editor-only, full C# source, no dependencies

Conflux never marks a conflict resolved. It writes the file and stops, so staging the result stays your call.

Already using Unity's Smart Merge? Conflux picks up the conflicts it hands back to you.