Wiki source code of Ways to Resolve Edit Conflicts
Last modified by Eleni Cojocariu on 2026/03/19 08:02
Show last authors
| author | version | line-number | content |
|---|---|---|---|
| 1 | XWiki warns you with a "Version Conflict" window, if someone edited the same part as you, and saved a Page while you were also editing it. This is used to prevent overwriting someone else’s changes on a Page. [[Resolving an Edit Conflict on a Page>>xwiki:documentation.xs.user.base.page.edit-page.resolve-conflict-page.WebHome]] includes selecting one of the options below: | ||
| 2 | |||
| 3 | {{image reference="select-method.png" size="large" alt="The Version conflict window"/}} | ||
| 4 | |||
| 5 | |=Option|=Description|=When to Use | ||
| 6 | |Merge and fix conflicts with your changes|Tries to merge your changes with the latest saved version, keeping as much as possible. Only conflicting parts will use the last user’s changes.|Recommended when you want to preserve both sets of changes. | ||
| 7 | |Force save your changes|Overrides the saved version entirely with your edits. The edits on the previous version are not really lost though, since they might be retrieved from the [[History tab>>xwiki:documentation.xs.user.base.page.view-page.view-history.history-tab.WebHome]].|Use when your want to keep only your changes in the current saved version. | ||
| 8 | |Reload the editor|Reloads the Page in the editor with the last saved version, discarding your changes.|Use when you want to see the last saved version of the Page. Your unsaved edits will be lost. | ||
| 9 | |[[Fix each conflict individually>>xwiki:documentation.xs.user.base.page.edit-page.resolve-conflict-page.fix-conflicts-individually.WebHome]]|Allows you to manually resolve each conflict by selecting the version to keep or entering a custom version.|This is advanced, use when precise control over every conflict is needed. |
