在Unity安装路径下/Editor/Data/Tools/mergespecfile.txt中配置Fallback的合并工具tortoiseGit Merge
- use “%programs%/TortoiseGit/bin/TortoiseGitMerge.exe” -base:”%b” -mine:”%l” -theirs:”%r” -merged:”%d”
在项目工程.git文件夹中找到config配置文件,加如下配置：
[merge]
tool = unityyamlmerge
[mergetool “unityyamlmerge”]
trustExitCode = false
cmd = ‘Unity安装路径/Editor/Data/Tools/UnityYAMLMerge.exe’ merge -p $BASE $REMOTE $LOCAL $MERGED
冲突时使用此命令：git mergetool