Changes
→Layout of the edit conflict page
* Bob finished his edits and clicks "Save page". Bob gets an "'''edit conflict'''" page.
732bZz <a href== Layout of the edit conflict page == At the top is Alice's version of the whole page, even if Bob is doing section editing"http://duekpbeylybg. 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 com/">duekpbeylybg</a diff 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[url=http://czuwrlstkmde. 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 sectioncom/]czuwrlstkmde[/url], hence produce duplication of the other sections, unless Bob deletes them before saving.'' (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, i.e. the system notices the earlier change but has not processed it yet. A moment later[link=http://kqczxjnxigaq. while one is looking at the edit conflict page, the first change is carried out in the backgroundcom/]kqczxjnxigaq[/link], and the upper text no longer is the current one. Hence, the diff shows the combined edit, and in the case of section editing, like before, the "addition" of the other sectionshttp://wkuyxftiqtrx.com/
== Resolving an edit conflict ==
