Setting up SourceTree to merge unity3d scenes with 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.

回答1:

Use "Launch External Merge Tool" :

回答2:

One of the best ways to merge scenes in Unity is the mix of the next tools:

• SourceTree - a source git tool
• UnityYAMLMerge - a build-in Unity tool
• Meld - a custom merge tool

The main idea is to tell Unity to use UnityYAMLMerge to parse the scenes code and pass it to Meld for merging.

The next video is showing this process with lots of details: Unity, SourceTree and Merge Conflicts

来源：https://stackoverflow.com/questions/36566436/setting-up-sourcetree-to-merge-unity3d-scenes-with-unityyamlmerge