Good day. I hope this is the correct place to post this question. If not, please feel free to point me in the right direction.
I have my Unity project set in a repository shared with my dev team, using SourceTree + UnityYAMLMerge + Meld to do version control and merging. I'm trying to pull from remote and merge into my local branch, but since the remote is several commits ahead, I get a conflict in my main scene. Up until now, I had been able to use UnityYAMLMerge without any issue to solve conflicts, but this time I'm suddenly getting an error message that says "UnityYAMLMerge error: Cannot find transform parent for fileID". Any idea what this error means?
Thanks in advance.
↧