Quantcast
Channel: Questions in topic: "merge"
Viewing all articles
Browse latest Browse all 202

Merge conflicts in main level scene

$
0
0
It seems I have properly broken things messing around with github. I was only trying to make a single project work between two computers, but now I have broken things beyond repair. ![alt text][1] [1]: /storage/temp/107358-errorscreenshot.png This is my console. The strange thing was when I looked at the Level.unity file, there was nothing between the "=============" and the ">>>>>>>>>>>>>>" to be causing any merge issues! In this state, I cannot even work on the game.

Viewing all articles
Browse latest Browse all 202

Latest Images

Trending Articles



Latest Images

<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>