Edit conflict

Part of our plans for Wiki Organisation and MediaWikiLite involve being able to synchronise articles between wiki installations which only have intermittent connectivity between each other. This means that the edit conflict problem becomes more extreme and needs to be handled with workflow.

We'd like to use the available diff algorithms to merge as much as possible and then move the rest into workflow categories for Human roles to deal with as required.

• Make it known in an article exhibiting edit conflicts using a message or extra action button
• Automatically categorise articles with edit-conflicts
• Add a special page allowing easy resolution of each edit conlict
• No revisions should ever be lost

See also

• MediaWikiLite
• Extension talk:P2P.php