MediaWiki:Explainconflict: Difference between revisions
From the Audiovisual Identity Database, the motion graphics museum
Content added Content deleted
No edit summary |
No edit summary |
||
Line 2: | Line 2: | ||
<center>{{Huge|{{Font|Montserrat|'''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> |
<center>{{Huge|{{Font|Montserrat|'''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> |
||
---- |
---- |
||
{{Big|{{Font|Montserrat|How to resolve:}}}}<br> |
{{Big|{{Font|Montserrat|'''How to resolve:'''}}}}<br> |
||
* Below this dialog is an editor containing the '''current revision''' of the page as it stands currently. |
* 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. |
* Below the editor you will find the differences box. This is what you will use to copy changes up to the editor. |
Revision as of 17:58, 12 October 2023
![](/w/thumb.php?f=Avid-editconflict-ace-vivi.png&width=300)
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.