Merging the unity of the 3D scene with Git

Question

I am trying to implement Git for my game project. For scripts this will work well because they are already in the text. But what about scene files? These are binary files, so merging them will be quite complicated. What if I put the game object on the stage and another employee places another in the same scene? How would we combine our scenes? Or should we always export / import it manually?

Thanks in advance.

Answer 1

In general, holding binary objects in the "source" store is a controversial idea. However, some specialized tools http://wiki.unity3d.com/index.php/UniMerge have recently appeared ... so that you can buy or write them from scratch.

Answer 2

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

Thus, the scenes are saved as a Yaml file, for more information about the format, see doc .

Despite the fact that I sometimes merge a scene manually, this is not a trivial operation, and you have to be very careful (git automerge cannot correctly combine them in 99% of cases).