Unity Git 项目解决合并冲突

冲突"/>

Unity Git 项目解决合并冲突

Unity项目使用git进行版本控制，最头疼的就是二进制文件。为此，Unity官方开发了YAMLMerge.exe工具，随着Unity一同发布。使用这个工具，需要进行一些设置。

1. 安装一款合适的 fallback merge tool，作为Unity Automerge 失败后的补救措施。推荐Diff Merge
2. （如果安装了Diff Merge可跳过这一步）打开Unity安装目录D:\Program Files\Unity\Editor\Data\Tools。找到这个文件mergespecfile.txt.

#
# UnityYAMLMerge fallback file
## Modify the next two lines if scene or prefab files should fallback
# on other that the default fallbacks listed below.
#
# %l is replaced with the path of you local version
# %r is replaced with the path of the incoming remote version
# %b is replaced with the common base version
# %d is replaced with a path where the result should be written to
# On Windows %programs% is replaced with "C:\Program Files" and "C:\Program Files (x86)" there by resulting in two entries to try out
# On OSX %programs% is replaced with "/Applications" and "$HOME/Applications" thereby resulting in two entries to try out# 这两行可替换
unity use "%programs%\YouFallbackMergeToolForScenesHere.exe" "%l" "%r" "%b" "%d"
pre