When a Recovery GameObject is created, that’s generally a sign that the YAML text that makes up a scene file got corrupted. This can easily happen if both of you work on the YAML-based object (scene or prefab) and then source control attempts to merge it.
It may be necessary to roll back to an earlier good version of that file and redo work.
I’m sorry you’ve had this issue. Please consider using proper industrial-grade source control in order to guard and protect your hard-earned work.
git CANNOT do any better at merging YAML, but I know it is fairly trivial to restore and compare previous versions of scenes and repair damage like this. Obviously it’s best to avoid two people working at once in a given YAML-based document, since they will never merge cleanly.
Personally I use git (completely outside of Unity) because it is free and there are tons of tutorials out there to help you set it up as well as free places to host your repo (BitBucket, Github, Gitlab, etc.).
As far as configuring Unity to play nice with git, keep this in mind:
Here’s how I use git in one of my games, Jetpack Kurt:
Using fine-grained source control as you work to refine your engineering:
Share/Sharing source code between projects:
Setting up an appropriate .gitignore file for Unity3D:
Generally setting Unity up (includes above .gitignore concepts):
It is only simple economics that you must expend as much effort into backing it up as you feel the work is worth in the first place.
“Use source control or you will be really sad sooner or later.” - StarManta on the Unity3D forum boards