koobas.hobune.stream
UnityYAMLMerge breaks a specific prefab on merge conflict
So I've been able to successfully merge some of my prefabs when conflicts come up, but for whatever reason my Player.prefab file (the biggest one by a wide margin) seems to blow up in UnityYAMLMerge. All other conflicts it asks me if I want to keep local or remote, but when it hits this one, it just says there are no changes (there definitely are) and if I say the merge was successful, the resulting file is now only 1kb and is two lines long. All content is removed except:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
How can I correctly resolve merge conflicts in this prefab? Are there any tools out there that make this easier? I saw GitMerge for Unity but that looks like it hasn't worked correctly in a long time.
I have a similar issue where a very large prefab is not merging correctly with the UnityYA$$anonymous$$L$$anonymous$$erge except it is just committing all the conflict markers as changes so my prefab becomes corrupted. I would do the merge manually my self, but it has 1,000s of merge conflicts for a roughly 400,000 line prefab file.
If you have solved this issue for you I'd like to see what you did and see if it applies to my scenario as well.
