I am currently working on a game with a small group. We are using Git as VCS and trying to solve merge conflicts with scenes.
We are using Source Tree and have inputed the correct path to the external tool and the argument
merge -p $BASE $REMOTE $LOCAL $MERGED, found on Unity’s manual page for Smart Merge.
The problem is when I use the external tool UnityYAMLMerge, it prompts several errors saying:
Error parsing file '.\Assets\Scenes\main_BASE_8036.unity': found unexpected end of stream
Error parsing file '.\Assets\Scenes\main_REMOTE_8036.unity': found unexpected end of stream
Error parsing file '.\Assets\Scenes\main_LOCAL_8036.unity': found unexpected end of stream
What am I doing wrong?