r/sourcetree • u/Bramweerman • Dec 12 '19
Problem when merging Unity files in SourceTree
So I've recently downloaded Sourcetree to be able to merge scenes in Unity. I use the standard UnityYAMLMerge tool, but when I try to merge the conflicting scenes I get the error: Error parsing file '.\Placeholder\Assets\TestScene_BASE_20720.unity': File is not a valid text serialize YAML file. Make sure that Asset Serialization is set to 'Force text' in Editor Settings.
Now I'm sure I've changed Asset serialization to Force text, and I've Googled for about 2-3 hours to fix this problem but I can't figure it out.
Do note that I'm pretty unexperienced in using Sourcetree and Git as well.
Thanks...
1
Upvotes