I wasn't able to get unityyamlmerge working until 5.5, but the version with the beta is working for almost all of my scene and prefab files. PS.: This is my first post here at Unity forums =P

Maybe I can send you my conflicted scene so you can check it out? I have no idea where to even start reporting this, IF one or any of these are a bug. On this last attempt, I also noticed that right before opening the merge tool, it was using 500MB of memory, and during the 7 minutes it was working it used 15 to 20% of my processor. Another surprise, all three files were empty. This last time it took more than 5 minutes to do the merge, reported (correctly) 1 conflict in an integer attribute, and after another 2 minutes waiting it opened the fallback merge tool. =/Īfter that I tried once again, reconfigured everything, reverted my merge and did it again. 100% reproduceable, I tried 3+ times and it crashed on all of them. But, for my surprise, my merge tool (I tried with tortoiseGitMerge and Per4Merge) reported that there were no differences whatsoever between any of the files (base, mine or theirs).Īfter trying to reconfigure everything and restarting my computer (who knows) I tried again with the exact same scene merge and, for my surprise, UnityYAMLMerge crashed. Get the setup working was actually pretty easy, but then the problems started.įirst thing I noticed was that it took like 40 seconds to parse my scene (its a 55k line file, 2.3MB, so it looked ok).Īfter that, UnityYAMLMerge reported (correctly) 1 conflict in an integer attribute, and tried to open the three way diff in my fallback merge tool (and that took another 40 seconds to happen). Today I tried really hard (for something like 4 hours) try to make UnityYAMLMerge work with tortoiseGit.

Araxis merge sourcetree