Learned the hard way that you should NOT delete the duplicated file in Unity… it screws a lot of stuff up… (The file ends up being “empty”)
But I got back to having my “car” scene and my snowman scene…
Maybe add something about not deleting the files in the editor being tracked but rather let sourcetree deal with the conflict and deletes… (Mine vs Theirs)