A Unity plugin which allows you to merge scene and prefab files when using git. More information: http://flashg.github.io/GitMerge-for-Unity/
You can merge both scenes and prefabs. Working with the scene hierarchy is currently being improved.
There are still a few bugs to work on. If the tool messes up something, remember to git reset --hard 😉