A simple plan for wiki concurrent edition
Wiki concurrent edition does not happen very often, but when it does, user can loose its work easily. Current feature is to prevent saving when page has been touched in the meantime. What I propose is to merge changes the way diff3 works and if needed, leave conflict markers in the document and warn the users that a conflicting merge has been done. This has the benefit of:
- saving the user work when (s)he press the save button in any case ;
- merge non conflicting cases automatically ;
- allow an other user (more experienced) to manually handle conflicting regions later.
What do you think ?