Changes: Help:Edit conflict

Revision as of 14:57, 14 September 2020

An edit conflict occurs in the rare situation when two or more users edit the same part of a page at the same time and make significantly different changes that they then try to save. If the wiki cannot merge the edits, it will display an edit conflict notification.

In this context, conflict refers to different versions of the article, not the users' actions. Remember, always assume good faith!

What happens when an edit conflict occurs?

If you are editing a page and another users commits an edit in the meantime, the wiki will attempt to seamlessly merge the two edits. However, if you both alter the same section (for instance, modify the lead paragraph on an article), the wiki will display the following notification:

EditConflict1 — The initial screen in an edit conflict

You can click on the yellow banner to read the rest of the notification:

EditConflict2 — The expanded notification

How to resolve edit conflicts?

When the conflict window appears it has three components:

The most recent version of the article below the notification, inside an edit box.
The difference between the saved version and your edit, highlighting conflicting sections. Fragments in red are present in your version of the article, but not in the most recent version of the article.
The wikitext for your version of the article.

To resolve the conflict, you have to manually add the changes from your article into the edit box. Once you're done, simply click Publish to save your article.

Remember: Only the contents of the edit box are saved when you click Publish.

EditConflict3 — Your version is in the bottom box, and it can be added into the main editing screen on the page.

How did I get into an edit conflict with myself?

It's possible! In this case, it's usually caused by using the browser's "Back" button to return to the edit box (for instance, if you forgot to add something minor), rather than clicking on "Edit" again, or double-clicking on the "Publish" or "Save" button, which sometimes causes two revisions to be submitted.

Further help and feedback

Browse and search other help pages at Help:Contents
Check Fandom Community Central for sources of further help and support
Check Contacting Fandom for how to report any errors or unclear steps in this article

@@ Line 1: / Line 1: @@
-An '''edit conflict''' is usually where two or more users start to edit the same part of a page at the same time and come up with different changes.
+An '''edit conflict''' occurs in the rare situation when two or more users edit the same part of a page at the same time and make significantly different changes that they then try to save. If the wiki cannot merge the edits, it will display an edit conflict notification.
+:''In this context, '''conflict''' refers to different versions of the article, not the users' actions. Remember, always [[Help:Assuming good faith|assume good faith]]!''
-==What happens, and how do I avoid edit conflicts with others?==
-The second editor to press save will be told that there is a conflict due to someone else saving the page since they started editing it.
+== What happens when an edit conflict occurs?==
-See [[m:Help:Edit conflict|Help:Edit conflict on Meta-Wiki]] for details on what happens, how to deal with edit conflicts, and advice on avoiding them.
+If you are editing a page and another users commits an edit in the meantime, the wiki will attempt to seamlessly merge the two edits. However, if you both alter the same section (for instance, modify the lead paragraph on an article), the wiki will display the following notification:
-==How did I get in an edit conflict with myself?==
+[[File:EditConflict1.png|thumb|500px|center|The initial screen in an edit conflict]]
-This occasionally happens if you edit, save, and then hit your browser's "Back" button to go back to the edit box.  You can avoid it by using the "edit" button to open a new instance of the edit box rather than using "Back". Another possible cause of this is if you click the "Save" or "Publish" button twice, causing two revisions to be submitted.
+You can click on the yellow banner to read the rest of the notification:
+[[File:EditConflict2.png|thumb|500px|center|The expanded notification]]
+== How to resolve edit conflicts? ==
+When the conflict window appears it has three components:
+* The most recent version of the article below the notification, inside an edit box.
+* The difference between the saved version and your edit, highlighting conflicting sections. Fragments in red are present in your version of the article, but not in the most recent version of the article.
+* The wikitext for your version of the article.
+To resolve the conflict, you have to manually add the changes from your article into the edit box. Once you're done, simply click Publish to save your article.
+:''Remember: Only the contents of the edit box are saved when you click Publish.''
+[[File:EditConflict3.png|thumb|500px|center|Your version is in the bottom box, and it can be added into the main editing screen on the page.]]
+== How did I get into an edit conflict with myself? ==
+It's possible! In this case, it's usually caused by using the browser's "Back" button to return to the edit box (for instance, if you forgot to add something minor), rather than clicking on "Edit" again, or double-clicking on the "Publish" or "Save" button, which sometimes causes two revisions to be submitted.
+== See also ==
+* [[Help:Editing|Editing]]
+* [[Help:Local issues|Local issues]]
+==Further help and feedback==
+{{Help and feedback section}}
+[[ca:Ajuda:Conflicte d'edició]]
+[[es:Ayuda:Conflicto de edición]]
 [[fr:Aide:Conflit de modification]]
+[[pl:Pomoc:Konflikt edycji]]
+[[pt:Ajuda:Conflito de edição]]
+[[ja:Help:編集の衝突]]
+[[tr:Yardım:Çakışmayı düzenle]]
+[[uk:Довідка:Конфлікт редагування]]
+[[vi:Trợ giúp:Sửa đổi mâu thuẫn]]
+[[zh:Help:编辑冲突]]
+[[Category:Editing]]
 [[Category:Help|Edit conflict]]
-[[Category:Expand|{{PAGENAME}}]]