Developers used to be afraid of automatic merging and conflict resolution in version control tools. We evolved. Many of those techniques also apply to merging

Developers used to be afraid of automatic merging and conflict resolution in version control tools. We evolved. Many of those techniques also apply to merging and conflict resolution of database stuff. In fact, from a certain perspective, the screw cases are a bit easier. http://zumero.com/docs/zumero_core.html#chapter_conflicts http://zumero.com/docs/zumero_core.html#chapter_conflicts