MediaWiki:Explainconflict: Difference between revisions

Content added Content deleted

Inline

Latest revision as of 16:35, 16 May 2024

Another user has saved a new revision of this page before you saved your changes.

Usually, we are able to solve this automatically, but the changes made led
to an edit conflict which needs to be resolved manually by the user.

How to resolve:

Below this dialog is an editor containing the current revision of the page as it stands currently.
Below the editor you will find the differences box. This is what you will use to copy changes up to the editor.
Using the differences box, copy the text highlighted in yellow and paste them into the corresponding modified section in the editor.
Once finished, press "$1" to save your changes.

@@ Line 1: / Line 1: @@
+[[File:Avid-editconflict-ace-vivi.png|center|300px|link=]]
-{{#js:
+<center>{{Huge|{{Font|AVID Web|'''Another user has saved a new revision of this page before you saved your changes.'''}}}}<br><br>{{Big|Usually, we are able to solve this automatically, but the changes made led <br>to an '''edit conflict''' which needs to be resolved manually by the user.}}</center>
-var element = document.getElementById("differences");
+----
-element.remove();
+{{Big|{{Font|AVID Web|'''How to resolve:'''}}}}<br>
-}}
+* Below this dialog is an editor containing the '''current revision''' of the page as it stands currently.
-<big>'''Someone else has changed this page since you started editing it.'''</big>
+* Below the editor you will find the differences box. This is what you will use to copy changes up to the editor.
+* Using the differences box, copy the text highlighted in yellow and paste them into the corresponding modified section in the editor.
-The below text window shows the current revision of the page. '''You will need to merge your proposed edits from lower window, into the upper window.'''<br>
-Then, once finished, press "$1" to submit your changes.
+* Once finished, press "$1" to save your changes.
+----