Wiki source code of Resolve an Edit Conflict on a Page

Last modified by Eleni Cojocariu on 2026/03/19 08:02

version	line-number	content
11.17	1	To resolve a [[version conflict>>xwiki:documentation.xs.user.base.page.edit-page.resolve-conflict-page.ways-resolve-edit-conflicts.WebHome]] on a Page:
1.2	2
	3	1. Select from the dropdown two versions to compare the changes and click on the "Show Changes" button.(((
	4	{{gallery}}
9.2	5	image:compare-changes-from.png alt="The View changes user interface with the dropdown to select the version to compare from"
	6	image:compare-changes-to.png alt="he View changes user interface with the dropdown to select the version to compare to"
1.2	7	{{/gallery}}
	8	)))
11.18	9	1. [[Compare the raw changes of the versions>>xwiki:documentation.xs.user.base.page.view-page.view-history.compare-page-versions.compare-versions-view.WebHome]] based on the versions selected, before making a decision for saving the Page.
11.17	10	1. Select one of the [[ways to resolve edit conflicts>>xwiki:documentation.xs.user.base.page.edit-page.resolve-conflict-page.ways-resolve-edit-conflicts.WebHome]].
1.2	11	1. Resolve the conflict with the chosen method by clicking "Save", or discard the changes.(((
9.2	12	{{image reference="save-resolve.png" size="large" alt="The Save and Cancel buttons"/}}
1.2	13	)))

Documentation for Product: