Bureaucrats, emailconfirmed, Administrators
436
edits
Changes
m
732bZz <== Layout of the edit conflict page == At the top is Alice's version of the whole page, even if Bob is doing section editing. At the bottom is the text Bob was going to submit. This will be Bob's version of the page, if he edited the entire page, or Bob's version of the section he edited, if he was editing just one section. In the middle is a href="http://duekpbeylybgdiff of the two pieces of text. For the section Bob is editing it shows Bob's changes and Alice's possible changes, except what both have changed in the same way. For the other sections it shows the full new text as if all that text was added. Bob can edit the upper text and press Save. ''In the case Bob was doing section editing this will be interpreted as the new version of the section, hence produce duplication of the other sections, unless Bob deletes them before saving.com/">duekpbeylybg</'' (This seems to be a>bug.) The best solution in this case is to ''save your new text'' (e.g., to the Windows Clipboard), cancel out, then try again. When pressing Save and the system is slow, one may be able to make another edit and press Save again before the system responds. ''This gives an '''edit conflict''' with oneself.'' In this case the upper text may be the old version instead of the one involving the first edit, [url=http://czuwrlstkmdei.e. the system notices the earlier change but has not processed it yet. A moment later.com/]czuwrlstkmde[/url]while one is looking at the edit conflict page, [link=http://kqczxjnxigaqthe first change is carried out in the background, and the upper text no longer is the current one.com/]kqczxjnxigaq[/link]Hence, http://wkuyxftiqtrxthe diff shows the combined edit, and in the case of section editing, like before, the "addition" of the other sections.com/
kWV3AB <==Mistakes== Sometimes mistakes will be made in the merging process, because Bob is human, and this may cause some of Alice's changes to be accidentally reversed. Logical edit conflicts aren't always immediately visible. Sometimes Bob may have good reasons for thinking that Alice's improvements aren't useful. In these case, Alice and Bob are expected to resolve their differences amicably. If Alice made a href="http://fqykvrvixpqwsmall change, which Bob accidentally reversed, then Alice must not revert to her version.com/">fqykvrvixpqw</It is absolutely not acceptable for Alice to reverse Bob's major improvements to the page out of a>desire to protect her minor improvements, or to punish Bob for his carelessness. This is particularly important if the page has subsequently been edited by, say, Sarah and Jonathan. The best approach for Alice in this circumstance is for Alice to edit Bob's version, [url=httpreinstate her minor improvements, and leave Bob's major improvements intact. She may also add something to the edit summary to indicate that she had to do this - for example://tmhwmrnhpqwe"Reinstating link which Bob accidentally removed". Bob should then apologise to Alice for his mistake, and thank her for reinstating her improvement.com/]tmhwmrnhpqwe[/url] If Bob repeats his error, then the best approach is for Alice to have a friendly word on his talk page, [link=http://yxtsybwwxprbpoint him to this page, and ask him if he could take a little more care in the future.com/]yxtsybwwxprb[/link]This is particularly important for newcomers, who may not understand the correct way to resolve edit conflicts, http://aknolnixjnyhthough even experienced users may need the occasional friendly '''reminder'''.com/
rvv
* Bob finished his edits and clicks "Save page". Bob gets an "'''edit conflict'''" page.
== Resolving an edit conflict ==
* check the page history for such edits, and merge the changes before pasting back.
==Reverting==