Jump to content

Help:Edit conflict

From Elite Dangerous Wiki

What an edit conflict means

An edit conflict occurs when a page changes after you began editing and MediaWiki cannot safely save your version over the newer one. The conflict screen may show your text and the newer page text. It does not mean your work has already been saved. The exact screen depends on the editor and installed extensions.

Resolve the conflict

  1. Keep your edit window open and read the newer version carefully.
  2. Copy your unsaved text somewhere safe if the page warns that it may be lost.
  3. Combine your intended change with the new text. Keep other editors' unrelated changes. Check that you have not duplicated a sentence, heading, reference or template.
  4. Preview the combined result, check the relevant section, and save with a summary that describes the combined change.

If the edits cannot be reconciled confidently, do not overwrite the other version. Explain the issue on the page's discussion page and invite a specific resolution. Do not repeatedly save competing versions. For guidance on focused section editing, see Help:Section.