I followed the instructions here: Setting up SourceTree to merge unity3d scenes with UnityYAMLMerge
But every time I pull, I get a lot of files with conflicts:
and for each of them I need to launch the external tool which doesn't show anything and after I close it the conflict is resolved:
This is unbearably annoying, should I even care about those zero name files?
And why Meld is unable to open any of those files?
Edit: I added the Library folder to my gitignore and now have less conflicted files, but Meld still doesn't work.