Jonathan Blow wrote an excellent article on the text-based entity file format he developed for The Witness, which was designed to be (more) mergeable:

http://the-witness.net/news/2011/12/engine-tech-concurrent-w...