Yes, it gets complex fast in collaborative setting. To my understanding, there are two robust approaches to collaborative editing: - git-style 3-way-merge - G

Yes, it gets complex fast in collaborative setting. To my understanding, there are two robust approaches to collaborative editing: - git-style 3-way-merge - Google Wave -style operational transform If somebody is experienced on the topic, I'd love to learn more about different approaches. Also, it would be awesome to have these as an open source DB projects (well, we have git) or even offered as IaaS.