- Home /
Question by
AtaTurkoglu · May 29, 2020 at 04:11 PM ·
gitmerge
Unityyamlmerge parsing error
When I try to merge a scene (Sandbox.unity) it prints the following message with the error: Merging: Project Chemistry/Assets/_Scenes/Sandbox.unity Normal merge conflict for 'Project Chemistry/Assets/_Scenes/Sandbox.unity': {local}: modified file {remote}: modified file Error parsing file '.\Project Chemistry\Assets\_Scenes\Sandbox_REMOTE_25408.unity': could not find expected ':' Project Chemistry/Assets/_Scenes/Sandbox.unity seems unchanged.
Comment