u/7WStudio

Our art team kept needing dev help with asset merge conflicts, so I built a GUI merge tool inside Unity
▲ 86 r/Unity3D

Our art team kept needing dev help with asset merge conflicts, so I built a GUI merge tool inside Unity

Hello! This one feels good to finally see working.

For too long, asset merges were this awkward team bottleneck: an artist changes a prefab or scene, Git throws a YAML conflict, and suddenly the work stops. The artist can’t safely tell what happened, a dev has to jump in, and everyone loses time on something that should not require reading Unity YAML by hand.

So I started building a GUI merge tool directly inside Unity.

The goal is to make .unity / .prefab conflicts readable as real Unity changes: objects, properties, hierarchy moves, component changes, and clear BASE / OURS / THEIRS choices.

It’s still in progress, but this is the first version where the workflow finally starts to feel right: the art team can see what changed, understand the conflict, and resolve more asset merges without waiting for a developer.

I’m planning to release the asset soon. If you want to follow it, there’s a waitlist on the asset site.

u/7WStudio — 7 days ago

Reviewing Unity scene and prefab changes in Git usually means staring at a wall of YAML and trying to guess what actually changed.

This is the part I wanted to fix first.

The review flow now turns that into something I can read much faster: changed objects, hierarchy moves, component edits, property changes, and references shown in a way that actually makes sense inside Unity.

So instead of reconstructing the whole scene in my head from text, I can scan the change, understand what happened, and decide much faster whether it looks safe or suspicious.

Feel free to check out the asset site if you want more details.

u/7WStudio — 23 days ago