- In Unity, go to Edit > Project Settings > Edit > Asset Serialization > Mode and select Force Text.
- Add UnityYAMLMerge.exe in %PATH%. (C:\Program Files\Unity\Editor\Data\Tools)
- In .gitconfig (C:\Users<user>) add at the end of the file:
[merge]
tool = unityyamlmerge
[mergetool "unityyamlmerge"]
trustExitCode = false
cmd = UnityYAMLMerge merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"