Siteadmin, Check users, nsTeam1RO, nsTeam1RW, nsTeam1_talkRO, nsTeam1_talkRW, oversight, Administrators
30,650
edits
Changes
Jump to navigation
Jump to search
mLine 1:
Line 1: − + − + Line 9:
Line 9: − +
no edit summary
An '''edit conflict''' occurs when two users try to edit the same wiki page at the same time. Whoever hits "Save page" first wins, but this is not always the best outcome. The other user needs to know how to recover from an edit conflict, so they don't lose their work.
An '''edit conflict''' occurs when two [[user]]s try to edit the same wiki page at the same time. Whoever hits "Save page" first wins, but this is not always the best outcome. The other user needs to know how to recover from an edit conflict, so they don't lose their work.
For example:
For example:
* '''John''' clicks Edit on an article.
* '''John''' clicks Edit on an [[article]].
* '''Mary''' clicks Edit on the same article.
* '''Mary''' clicks Edit on the same article.
* '''John''' finishes editing, clicks Save page and the article now contains his version.
* '''John''' finishes editing, clicks Save page and the article now contains his version.
A similar situation would have happened if Mary had saved her version of the page first, since when John clicked Save page his edits would then conflict with the current version of the page.
A similar situation would have happened if Mary had saved her version of the page first, since when John clicked Save page his edits would then conflict with the current version of the page.
In practice, manual merging is not always necessary as the Conservapedia system is able to resolve many potential edit conflicts automatically, if the edits were made to different paragraphs or sections of a page. The edit conflict page normally only appears when two people were editing the same few lines and automatic merging cannot tell which words or lines to save.
In practice, manual [[merging]] is not always necessary as the [[Conservapedia]] system is able to resolve many potential edit conflicts automatically, if the edits were made to different paragraphs or sections of a page. The edit conflict page normally only appears when two people were editing the same few lines and automatic merging cannot tell which words or lines to save.
[[Category:MediaWiki]]
[[Category:MediaWiki]]