TortoiseGit 和 UnityYAMLMerge
TortoiseGit and UnityYAMLMerge
我正在尝试将 TortoiseGit 设置为与 UnityYAMLMerge 一起使用，但是当我按下以尝试编辑 .unity 文件冲突时，我看到控制台 window 打开和关闭速度太快而无法读取其中的任何内容它。
我设置的和docs and this vid: https://www.youtube.com/watch?v=RcJwamDAAGk
一样
我是这样设置的：
我还能做些什么来让它发挥作用？
UnityYAMLMerge is shipped with a default fallback file (called mergespecfile.txt, also in the Tools folder) that specifies how it should proceed with unresolved conflicts or unknown files. This also allows you to use it as the main merge tool for version control systems (such as git) that don’t automatically select merge tools based on file extensions. The most common tools are already listed by default in mergespecfile.txt but you can edit this file to add new tools or change options.
使用 TortoiseGitMerge 作为后备
为后备文件编辑C:\Program Files\Unity\Editor\Data\Tools\mergespecfile.txt并教导UnityYAMLMerge使用TortoiseGitMerge :
# TortoiseGitMerge
* use "%programs%\TortoiseGit\bin\TortoiseGitMerge.exe" /base:"%b" /mine:"%l" /theirs:"%r" /merged:"%d"
来自Resoving Unity Scene Merge Conflicts with UnityYAMLMerge (Smart Merge) and TortoiseGit
我正在尝试将 TortoiseGit 设置为与 UnityYAMLMerge 一起使用，但是当我按下以尝试编辑 .unity 文件冲突时，我看到控制台 window 打开和关闭速度太快而无法读取其中的任何内容它。
我设置的和docs and this vid: https://www.youtube.com/watch?v=RcJwamDAAGk
一样我是这样设置的：
我还能做些什么来让它发挥作用？
UnityYAMLMerge is shipped with a default fallback file (called mergespecfile.txt, also in the Tools folder) that specifies how it should proceed with unresolved conflicts or unknown files. This also allows you to use it as the main merge tool for version control systems (such as git) that don’t automatically select merge tools based on file extensions. The most common tools are already listed by default in mergespecfile.txt but you can edit this file to add new tools or change options.
使用 TortoiseGitMerge 作为后备
为后备文件编辑C:\Program Files\Unity\Editor\Data\Tools\mergespecfile.txt并教导UnityYAMLMerge使用TortoiseGitMerge :
# TortoiseGitMerge
* use "%programs%\TortoiseGit\bin\TortoiseGitMerge.exe" /base:"%b" /mine:"%l" /theirs:"%r" /merged:"%d"
来自Resoving Unity Scene Merge Conflicts with UnityYAMLMerge (Smart Merge) and TortoiseGit