Jump to content
Toggle menu
Toggle preferences menu
Toggle personal menu
Not logged in
Your IP address will be publicly visible if you make any edits.
Revision as of 20:40, 27 October 2026 by DivošiRunner (talk | contribs) (Unify archive styling and navigation; improve template forms and upload guidance)
(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)

An edit conflict means someone saved a change while you were working. Your text has not been saved yet. Keep a copy before reloading or leaving.

Resolve a conflict

  1. Read both versions. The paragraph-based conflict screen pairs the current page text with your submitted text and highlights differences.
  2. For each conflicting passage, choose the version you want to keep. Edit or combine the wording when both people added useful information.
  3. Review the whole result, including links, sources and status labels. Do not select your version everywhere just to get past the warning.
  4. Add a short edit summary and save the merged result. If another change happened meanwhile, review the new conflict as well.

On a narrow screen, the versions are stacked and labelled Current page and Your changes.

You can copy your submitted text from the conflict screen before trying a different approach. That recovery text belongs to your account; a recovery link is not a way to share private content. Keep Gatekeep text inside its workspace.

The interface can differ when an editor falls back to MediaWiki's original conflict form. The rule is the same: preserve both contributions and merge deliberately. Your editing preferences include the paragraph-based conflict option.

If you are unsure which version is correct, keep your unsaved text and ask the other editor on the discussion page or in Discord. Help:History and undo explains comparing already saved revisions.