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.
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.