How to properly set up YAMLMerge and a merge tool on windows

Questions & Answers
1

Is there a proper and thorough guide on how to set up YAML merge on windows?

I tried to follow this: git - Setting up SourceTree to merge unity3d scenes with UnityYAMLMerge - Stack Overflow

but Meld is always showing this:

alt text

And I also got these many zero files as conflicts on each small change (do I even need them?) and the only way to “resolve” them is to launch the external merge tool (which I don’t think work).

So is there a proper guide on how to set this up?

2

in MERGESPECFILE.txt, changing all the “$” to “%” worked for me.

so it should look like this:

unity use “C:\Program Files (x86)\Meld\Meld.exe” “%r” “%b” “%l” -o “%d” --auto-merge
prefab use “C:\Program Files (x86)\Meld\Meld.exe” “%r” “%b” “%l” -o “%d” --auto-merge

Default fallbacks for unknown files. First tool found is used

  • use “C:\Program Files (x86)\Meld\Meld.exe” “%r” “%b” “%l” -o “%d” --auto-merge