Help:Edit conflicts: Difference between revisions
More actions
DivošiRunner (talk | contribs) Unify archive styling and navigation; improve template forms and upload guidance |
DivošiRunner (talk | contribs) Polish the homepage and public search/link previews; keep template metadata scoped |
||
| Line 16: | Line 16: | ||
If you are unsure which version is correct, keep your unsaved text and ask the other editor on the [[Help:Talk pages|discussion page]] or in {{Discord|Discord}}. [[Help:History and undo]] explains comparing already saved revisions. |
If you are unsure which version is correct, keep your unsaved text and ask the other editor on the [[Help:Talk pages|discussion page]] or in {{Discord|Discord}}. [[Help:History and undo]] explains comparing already saved revisions. |
||
[[Category:Editing help]] |
[[Category:Editing help]] |
||
{{Page metadata|page=Help:Edit conflicts|title=Resolving edit conflicts|description=Recover your unsaved text, compare conflicting edits and choose the version to keep before saving.}} |
|||
Latest revision as of 21:12, 27 October 2026
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
- Read both versions. The paragraph-based conflict screen pairs the current page text with your submitted text and highlights differences.
- For each conflicting passage, choose the version you want to keep. Edit or combine the wording when both people added useful information.
- Review the whole result, including links, sources and status labels. Do not select your version everywhere just to get past the warning.
- 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.