Is there a proper and thorough guide on how to set up YAML merge on windows?
I tried to follow this: https://stackoverflow.com/a/45738772/4279201
but Meld is always showing this:
![alt text][1]
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?
[1]: https://i.stack.imgur.com/D8j6d.png
↧
