设置SourceTree以将unity3d场景与UnityYAMLMerge合并

本文介绍了设置SourceTree以将unity3d场景与UnityYAMLMerge合并的处理方法，对大家解决问题具有一定的参考价值，需要的朋友们下面随着小编来一起学习吧！

问题描述

所以我按照

SO I followed the instructions from here and tried to set up a merge for scenes in unity. The instructions about SourceTree are right at the bottom. I added the merge tool provided by unity as a custom merge tool, but when I try to merge a branch that changed the scene into my branch I get a conflict and the merge fails. I'm a total noob at this thing and don't know what to do now. Is it possible to make it automatic or I have to write some stuff in the terminal and if I do what should I write to resolve conflicts in a unity scene. I am also using the personal version of Unity3d if that matters.

Edit: i've managed to run the merge tool but now it is saying Error parsing file... File is not a valid text serialized YAMLfile.

The thing is i'm sure that Asset Serialization is set to Force text in the Editor settings.

解决方案

Use "Launch External Merge Tool" :

这篇关于设置SourceTree以将unity3d场景与UnityYAMLMerge合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！