Smart Merge for Git Not Working

I'm having issues getting the Unity merge tool to even run on a project using Git. This project is using Unity 2018.2.11f1, and I followed the instructions in the documentation here and added the .gitconfig file to my project, but when I try git mergetool, it uses vimdiff, which is the default option. I then tried to set the mergetool using git config --local merge.tool <path> and when I try git mergetool again, it gives the error "git config option merge.tool set to unknown tool." I'm pointing it to the path of the included UnityYAMLMerge.exe from my Unity install, but it refuses to recognize it as a valid merge tool, any ideas as to why or ways to fix it?

2 Likes

Did you ever get this working?

If you have the .gitconfig at the root of your project use
git config --local include.path ../.gitconfig to reference it in .git/config