Ways to Resolve Edit Conflicts
Reference
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 includes selecting one of the options below:
| Option | Description | When to Use |
|---|---|---|
| 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. |
| 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. | Use when your want to keep only your changes in the current saved version. |
| 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. |
| Fix each conflict individually | 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. |
FAQ
When can conflict edits occur?
Conflict edits may appear only in editors that are not real-time. For example, they never appear when editing with the In-place WYSIWYG editor or with the Standalone WYSIWYG editor.
What happens when two users edit the same Page at the same time but different parts of it?
The system uses a merge on save mechanism to automatically combine both users’ changes. For example, if edits affect different sections or one user edits an object while another edits the Page content, the changes are merged and a message “Saved by merging changes” appears, instead of a conflict window.
Are there cases when a conflict is not triggered even if two users make conflicting changes?
Yes, for example when a user deletes an Object and the other user tries to edit a field of that same Object, the following message appears, instead of a conflict.
In this case, you can no longer apply your changes to that Object.
