This sounds similar to http://revisionator.com. It's also a web based editor with built in revision control. And, it has moderated documents so you can selectively accept / reject changes.
Someone mentioned conflict resolution. When someone does an unclean merge, it steps you though conflict resolution with the GUI.
It even has branches with merging. (Try copying a document and it creates a branch.)
Someone mentioned conflict resolution. When someone does an unclean merge, it steps you though conflict resolution with the GUI.
It even has branches with merging. (Try copying a document and it creates a branch.)