MediaWiki:Explainconflict - Revision history

Tachyony: ←Created page with '{{fmbox | id = editconflict-notice | type = editnotice | image = none | text = Someone else has changed this page since you started editing it, resulting in an '''edit conflict'''.

The '''upper text area''' contains the page text '''as it currently exists''' (without your changes).

'''Your version''' of the page (with your changes) is shown in the '''lower text area'''.

2022-02-02T19:07:05Z

←Created page with '{{fmbox | id = editconflict-notice | type = editnotice | image = none | text = Someone else has changed this page since you started editing it, resulting in an '''edit conflict'''. <ul id="editconflict-notice-1"> <li>The '''upper text area''' contains the page text '''as it currently exists''' (without your changes).</li> <li>'''Your version''' of the page (with your changes) is shown in the '''lower text area'''.</li> </ul> <div id=...'

New page
{{fmbox
| id = editconflict-notice
| type = editnotice
| image = none
| text =
Someone else has changed this page since you started editing it, resulting in an '''[[Help:Edit conflict|edit conflict]]'''.
<ul id="editconflict-notice-1">
<li>The '''upper text area''' contains the page text '''as it currently exists''' (without your changes).</li>
<li>'''Your version''' of the page (with your changes) is shown in the '''lower text area'''.</li>
</ul>
<div id="editconflict-notice-2"> You will have to '''merge''' your changes into the existing text in the upper text area to incorporate your edits. Only the text in the '''upper text area will be saved''' when you press "{{int:Publishchanges}}"; all other changes in the '''lower text area will be lost'''. <br />

Please do not just copy the text from the lower text area into the upper, unless you're ''sure'' that you want to undo all other changes made while you were editing this page. Rather, please try to compare the two versions and combine them into one text that preserves both your edits and any improvements made by others.

An easy way to resolve an edit conflict without losing your work is to open another tab in your browser, and edit the page in that tab copying your changes from the section at the bottom of this page.

</div>
{{#switch: {{NAMESPACE}}
| {{TALKSPACE}}
| {{ns:Project}}
| {{ns:MediaWiki}} =

<div id="editconflict-notice-3">

----

If you were '''adding a comment to a [[Wikipedia:Talk page|discussion]]''', it may be easier to resolve the conflict by redoing the edit from the start: </div>
<ol id=editconflict-notice-4>
<li>Locate the text you were trying to add in the lower text area, or use your browser's "Back" button to return to the previous page and locate it there.</li>
<li>[[Cut, copy, and paste|Copy]] the text you were trying to add to your clipboard.</li>
<li>If you were editing a specific section, go back to the original page and click the "[{{int:editsection}}]" link again. If not, just click the "{{int:edit}}" link at the top of the page.</li>
<li>[[Cut, copy, and paste|Paste]] the text you copied into the appropriate spot on the edit form and press "{{int:Publishchanges}}". This time, you will hopefully not get an edit conflict.</li>
</ol>
}}
}}