我正在尝试使用Smart Merge合并我和我的合作伙伴一起工作的Unity场景。我的其他资源和预制件都可以通过Smart Merge解决冲突,但是有一个场景根本没有合并。
在我的.git/config文件中,我添加了以下内容:
[merge]
tool = unityyamlmerge
[mergetool "unityyamlmerge"]
trustExitCode = false
cmd = 'C:\\Program Files\\Unity\\Editor\\Data\\Tools\\UnityYAMLMerge.exe' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
我还包括了一个 .gitattributes 文件,其中包含
*.unity binary
*.prefab binary
*.asset binary
我已将资产序列化设置为“强制文本”,版本控制设置为“可见元文件”。
我们的预制件和其他资产合并得很好,但其中一个场景根本无法合并。
在终端运行
git mergetool
命令时,它会显示此指定场景的冲突,但最后返回以下内容:Left 563852304.Light.m_Color.r add as 0.8962264
Right 563852304.Light.m_Color.r add as 0.9433962
Left 610301896.GameObject.m_IsActive add as 0
Right 610301896.GameObject.m_IsActive add as 1
Left 610301898.Transform.m_LocalPosition.x add as -13.07
Right 610301898.Transform.m_LocalPosition.x add as -14.31
Left 610301898.Transform.m_LocalPosition.y add as 2.6
Right 610301898.Transform.m_LocalPosition.y add as 2.14
Left 610301898.Transform.m_RootOrder add as 8
Right 610301898.Transform.m_RootOrder add as 7
Left 869912137.Transform.m_LocalPosition.x add as -7.36
Right 869912137.Transform.m_LocalPosition.x add as -7.333
Left 869912137.Transform.m_LocalScale.x add as 4
Right 869912137.Transform.m_LocalScale.x add as 4.0070143
Conflict handling:
Xmas-Prototype-01/Assets/_Scenes/InitScene.unity seems unchanged.
Was the merge successful [y/n]?
还有更多的冲突,但太多了无法列出。
这是唯一一个没有与我的本地分支合并的文件。我能否以某种方式让这个场景合并?
谢谢!