Issues with Merging and Unity Scenes

[cooperj]

⚠️ TL;DR. One person to work on a scene at a time. A person does the work, checks in the code and then another pulls it out.

Background

When two people have had the project checkout to them at the same time, merge conflicts happen. This has happened with #11 and #15. What happens is that Unity has "blob-ish" data to store the scenes. The data then becomes corrupted when merged together.

Prevention

So to prevent this we need to check out the project one person at a time. This is kinda crappy - but it is our only option, because we used GitHub and not the in-house Unity Collaborate system.

Also, if you've not made changed to the scene, dont check it in!

The Cure (How to fix if this happens to you or me again)

Clone down the QA branch, the one that everything is being merged into. Then download as a zip the changes you want to add. Let windows replace the files outright.

Then push these changes into the branch.

It will work, but any changes happened at the same time will be lost.