Merge Unity 3D scene with Git

Question

I'm trying to implement a Git for a game project of mine. For scripts, it would work well because they are already in text. But what about scene files? They are binary files so merging them will be quite hard. What if I put a game object in the scene and another co-worker put another in the same scene? How would we merge our scenes? Or should we always export / import it manually?

Thanks in advance.

Answer 1

You can save scene files in text mode: Edit->Project Settings->Editor->Asset Serialization: Force Text

This way scenes are saved as Yaml file, for more details on the format, have a look at the doc.

Despite I sometimes merge scene by hand, it's not a trivial operation, and you must be very careful (git automerge isn't able to merge them properly in 99% of the case).

Answer 2

Generally holding binary objects in 'source' repository is controversial idea. However recently some specialized tools have appeared http://wiki.unity3d.com/index.php/UniMerge ... so they can be bought or written from scratch.