Haden2
commented
9 years ago Did not mean to close and delete this. My bad. It forced me to commit to things and it was the only way out of that branch. That terrain looked pretty awesome though. Was that an asset or was it created by you? My mind was like blown when I went down the stairs. There were a lot of weird bugs going on with the shadows on the ground. So was the error happening because you moved the enemy player while I was working on its script?
I'm unable to resolve the merge conflicts between this branch and master. I'm opening this pull request as an example of what can go wrong with source control. In this case we both made changes to the same objects within our scene in ways I can't seem to reconcile. While you won't see the problems here in github, I suggest you try to compare the scene in github to see the conflicts.
To resolve the issue I'll just discard my branch. My environment wasn't very good to begin with and it was a good learning experience.
It may be a good idea in the future to be more mindful of potential conflicts. Maybe with more defined (separated) tasks, only letting one person actually alter a scene at time, or maybe just working in smaller chunks? The pull-request-gate to master might help minimize these kinds
I have a feeling this kind of problem could crop up again later if we're not careful, likely at a worse time.
Take a look at the "quick" environment I had going before I delete the branch, especially the "terrain" section.