MediaWiki:Explainconflict: Difference between revisions
From the Audiovisual Identity Database, the motion graphics museum
Content added Content deleted
m (Text replacement - "AVID Sans" to "Montserrat") |
m (Text replacement - "Montserrat" to "AVID Web") |
||
(2 intermediate revisions by one other user not shown) | |||
Line 1:
[[File:Avid-editconflict-ace-vivi.png|center|300px|link=]]
<center>{{Huge|{{Font|
----
{{Big|{{Font|
* 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.
|
Latest revision as of 16:35, 16 May 2024
![](/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.