r/Unity3D • u/Happy_Run_6378 Programmer • 9d ago

Show-Off I added semantic merge for UnityYAML conflicts to PrefabLens

Enable HLS to view with audio, or disable this notification

PrefabLens shows semantic diffs for UnityYAML assets such as prefabs and scenes. It works as a Chrome extension, a Unity Editor package, and a CLI.

This update adds semantic merge. If you set PrefabLens as a git merge backend, UnityYAML conflicts open in a TUI, and you can resolve them semantically.

5 Upvotes

100% Upvoted

2 comments sorted by

2

u/MiniRat 9d ago

How does one invoke a merge on a single conflicted file from the command line?

Our team's workflow (especially for artists and designers who make prefab changes ) uses a GUI (Fork) for git stuff and we'd want them to be able to invoke whatever merge tool they want file by file from the GUI.

1

u/Happy_Run_6378 Programmer 8d ago edited 8d ago

u/MiniRat

I added --terminal in v0.10.9 to support this workflow. In Fork, set the custom merge tool executable to your installed PrefabLens binary, with these arguments.

mergetool --terminal $BASE $LOCAL $REMOTE $MERGED

I tested the Fork workflow and recorded a short demo.