[Unity]SVN使用UnityYAMLMerge处理冲突

SVN配置步骤

1. 右键[TortoiseSVN - Settings]
2. 左侧列表选中[Diff Viewer - Merge Tool]
3. 点[Advanced...]
4. [Add...]
5. prefab配置

"D:\Unitys\2018.4.1f1\Unity\Editor\Data\Tools\UnityYAMLMerge.exe" merge -p -o G:\SvnLog\merge.log --force "%base" "%theirs" "%mine" "%merged"

同上，再添加一个“.unity”文件的配置即可