A Unity plugin which allows you to merge scene and prefab files when using git. More information: http://flashg.github.io/GitMerge-for-Unity/

IMPORTANT: I've created a new version of this project that will replace this one when it's ready. There are still some edge cases to get working properly, but it will be linked here soon™.