I recently had to merge two branches with 2 merge conflicts, I wanted to resolve them manually to make sure I wasn’t breaking anything.
However, even after setting the merge to “Manual” in the merge options, clicking “Resolve conflicts” solved the conflicts automatically. This happened both in the editor and in the external application.
Am I missing something, or is this a bug?
@PaulMDev Where the two branches conflicting in the same files? Or were they independent changes?
There were conflicts in the same files, yes
merge_scenario.mov.zip (28.6 MB)
I’m trying to repro the scenario, but I’m not having success, can you check if I’m missing something?
It doesn’t look any different from what I’m doing, except the Mergetool window never opens on my side.
I recorded a small video just in case.
merge-test.zip (10.2 MB)
Mmmmm let’s continue debugging it. Can you share with me your client.conf file? Strip out user name, passwords, default server and so on. I’m only interested in the mergetools section. You can paste them here or DM them to me.
I sent you a DM
Aha! I think I have it!
Thanks for the client.conf, that gave me what I needed.
Your .prefab / .unity entry chains two merge tools:
Our merge pipeline runs them in order and stops at the first one that exits successfully. UnityYAMLMerge with -p auto‑resolves what it can and exits 0, so the interactive plastic xmerge step is never reached in your case, that’s why no merge tool window opens. On my side I couldn’t reproduce because my default config doesn’t include UnityYAMLMerge, so the chain is just plastic xmerge, which always opens the window.
Workaround: in your client.conf, in the block whose is .prefab;.unity, remove the first line (the UnityYAMLMerge.exe one) and keep only the plastic xmerge line. You’ll lose Smart Merge auto‑resolution for those file types, but every conflict will open the interactive tool.
We may also look at making the Manual conflict resolution option in Merge Options skip the premerge step in a multi‑tool chain, so the checkbox matches expectations without editing the config. I’ll keep you posted if we ship that.
It works!
Thank you very much.
Having the checkbox match the expectations would be great.
Thank you again!
Yes, we will probably make the Desktop tool to omit any other pre chained merge tools, and invoke directly our while using that “Manual merge” preference.
