title: Setting up SourceTree to merge unity3d scenes with UnityYAMLMerge
body: <p>SO I followed the instructions from <a href="http://docs.unity3d.com/Manual/SmartMerge.html" rel="nofollow">here</a> 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.</p>
  
  <p>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.</p>
  
  <p>The thing is i'm sure that Asset Serialization is set to Force text in the Editor settings.</p>