If two users edit the same wiki topic, what methods have been used in wikis (or in similar collaborative editing software) to merge the second user's edits with the first?
I'd like a solution that:
- doesn't require locking
- doesn't lose any additions to the page.
- It may add extra "boilerplate" text to indicate where differing changes were made.
(I'm interested in a solution that could be used to implement this uservoice idea for stack overflow.)
Best Answer
My experience with most Wiki software (e.g. MediaWiki) is that it tracks the version of the document you are editing. If the document changes during your time editing, your change is rejected and you are prompted to perform a manual merge.