Nubio - View entry
37: What if two people edit the same article at the same time
See Help:Edit conflict.
When the second person (and later persons) attempts to save the page mediawiki will attempt to merge their changes into the current version of the text. If the merge fails then the user will receive an \"edit conflict\" message, and the opportunity to merge their changes manually. The wiki will also check for a conflict if you are editing and do a preview of the edit. Multiple consecutive conflicts are noticed, and will generate a slightly different message. This is similar to Concurrent Versions System (CVS), a widely used software version management system.
When the second person (and later persons) attempts to save the page mediawiki will attempt to merge their changes into the current version of the text. If the merge fails then the user will receive an \"edit conflict\" message, and the opportunity to merge their changes manually. The wiki will also check for a conflict if you are editing and do a preview of the edit. Multiple consecutive conflicts are noticed, and will generate a slightly different message. This is similar to Concurrent Versions System (CVS), a widely used software version management system.
Additional keywords: conflict error
Wiki-text
