Community Central
Register
Community Central
No edit summary
No edit summary
(5 intermediate revisions by 5 users not shown)
Line 1: Line 1:
An '''edit conflict''' occurs in the rare situation when two or more users start to edit the same part of a page at the same time and make significantly different changes when they hit Publish.
+
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 Publish 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?==
  +
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:
   
 
[[File:EditConflict1.png|thumb|500px|center|The initial screen in an edit conflict]]
 
[[File:EditConflict1.png|thumb|500px|center|The initial screen in an edit conflict]]
Line 9: Line 11:
   
 
[[File:EditConflict2.png|thumb|500px|center|The expanded 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.
The easiest way to resolve an edit conflict once it happens is to add your edits into the version that was saved before you attempted to save yours. When the edit conflict window appears, you will see a box with your version of the page as well as the most recently saved version. Note that the text that is in red on the edit conflict screen is yours, but it is not in the article yet. You will need to manually re-add that to the page. You can copy it from the bottom box, where your text is, and add paste it into the main editing screen. Then press Publish and your edit will be added too.
 
   
  +
:''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]]
 
   
 
[[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.]]
Also remember that while edit conflicts do have the word "conflict" in the name, they're not a fight or an argument. No one purposefully got into an edit conflict with you, so remember to assume good faith and not become involved in any arguments over the edit conflict. It was just a case of bad timing!
 
   
==How did I get in an edit conflict with myself?==
+
== How did I get into an edit conflict with myself? ==
This occasionally happens if you edit, Publish, 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 clicked the "Save" or "Publish" button twice, causing two revisions to be submitted.
+
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==
+
== See also ==
*Learn about [[Help:Editing|editing]].
+
* [[Help:Editing|Editing]]
*Learn about [[Help:Local issues|local issues]].
+
* [[Help:Local issues|Local issues]]
   
 
==Further help and feedback==
 
==Further help and feedback==
 
{{Help and feedback section}}
 
{{Help and feedback section}}
 
 
 
[[ca:Ajuda:Conflicte d'edició]]
 
[[ca:Ajuda:Conflicte d'edició]]
 
[[es:Ayuda:Conflicto de edición]]
 
[[es:Ayuda:Conflicto de edición]]
Line 33: Line 38:
 
[[pt:Ajuda:Conflito de edição]]
 
[[pt:Ajuda:Conflito de edição]]
 
[[ja:Help:編集の衝突]]
 
[[ja:Help:編集の衝突]]
  +
[[tr:Yardım:Çakışmayı düzenle]]
  +
[[uk:Довідка:Конфлікт редагування]]
 
[[vi:Trợ giúp:Sửa đổi mâu thuẫn]]
 
[[vi:Trợ giúp:Sửa đổi mâu thuẫn]]
 
[[zh:Help:编辑冲突]]
 
[[zh:Help:编辑冲突]]

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.

See also

Further help and feedback