koobas.hobune.stream
GitHub for Unity problems
So I’ve run into a few problems with Unity and Github and would greatly appreciate some help.
About two months ago I started working on my first Unity project and soon after starting I broke off from the ‘master’ branch onto a different branch called ‘landscape’. Last week I finally finished the scene I was working on and wanted to merge it back onto ‘master’ and ran into a problem. I was able to check out the ‘master’ branch, however, I’m not able to merge ‘landscape’ onto ‘master’ and when I try checking out ‘landscape’ again it also fails. Here’s what I get from terminal:
After unsuccessfully trying to resolve the problem above, I decided to simply download the completed version of ‘landscape’ remotely from GitHub. To my surprise, however, my scene is completely empty. All of my scripts and resources are there but nothing is in my scene and the sprites and prefabs are broken. I can only imagine that I wasn’t committing some important metafiles to GitHub?
If someone knows how to resolve any of the two issues stated above I would appreciate your help!
