Yaml scene merge broke the scene

Unity Engine
1

First time ever I see the case like that:
I am using git with multiple branches (master/dev/next_version) and switch between them pretty often.
A week ago we released new app version and I commited it to master and proceeded in dev branch. I am 100% sure that scene worked fine, I tested it hundreds times.

What happens now - I did some dev and testing and had to create a hot fix for recent release, but starting the scene in editor using the latest commit I get these errors:

6712240--771517--report.png
6712240--771517--report.png1198×128 18.6 KB

and “Missing Prefab (Dummy)” object has created on the top of hierarchy. Stopping the playback, this object not being destroyed.

The worst here that there is no info at all, even in Editor log. I don’t see any option to try find the source of the problem.

Component (RectTransform) added to multiple GameObjects! Removing it!
(Filename: ./Runtime/BaseClasses/GameObject.cpp Line: 876)

Transform component could not be found on game object. Adding one!
(Filename: ./Runtime/BaseClasses/GameObject.cpp Line: 744)

GameObject has multiple Transform components! Merged into single one.
(Filename: ./Runtime/BaseClasses/GameObject.cpp Line: 895)

Furthermore, switching to ANY older then this release commit I got the same issue, but I worked on it for 1 week before, and that was absolutely OK until I switched the branches.

I found only 1 thread on the forum about it saying that scene could be merged incorrectly by Yaml, but this doesn’t describe my case much…

2

Merging YAML (scenes or prefabs) is a huge open festering wound in Unity3D when using multiple branches of source control. We bump into it all the time. Unity offers a YAML merging tool but our team has never been able to make it work better.

Our solutions are to:

  • clone scenes when going into a release branch, IF massive changes are expected

  • hand merge scenes (and prefabs) only (by duping them in the branch, then bringing both up and working between them by hand AFTER the merge takes place and both versions are visible)

  • break scenes into lots of subscenes, each loaded additively (doesn’t help in all cases but can definitely reduce churn)

The underlying issue is that often the default git merge will work just fine, but the scene will have subtle damage which you will not notice until much later.

And if your branch is a long-lived pending feature branch, the more time it spends away from develop / master, the worse it gets, the higher chance of silent errors.

It sucks and I have yet to see any solution that actually addresses it.

1 Like
3

I was usually able to fix this by looking for any prefab references in the scene that were missing or/and deleting the Library folder. Unity might have kept some state from the previous repository state and was not smart enough to update it I guess