Wiki source code of Fix each Conflict Individually
Last modified by Eleni Cojocariu on 2026/10/02 09:12
Show last authors
| author | version | line-number | content |
|---|---|---|---|
| 1 | [[Resolving conflicts>>xwiki:documentation.xs.user.base.page.edit.resolve-conflict-page.WebHome]] has several [[ways to resolve an edit conflict>>xwiki:documentation.xs.user.base.page.edit.resolve-conflict-page.ways-resolve-edit-conflicts.WebHome]], allowing also the advanced option of fixing each conflict individually: | ||
| 2 | |||
| 3 | {{image reference="fix-conflicts-individually.png" size="large" alt="The Page properties view with the Fix each conflict individually option from the dropdown"/}} | ||
| 4 | |||
| 5 | |=Part|=Description | ||
| 6 | |[[Differences in the content>>xwiki:documentation.xs.user.base.page.view.history-tab.view-history.compare-page-versions.compare-versions-view.WebHome]]|Displays differences between the version you're trying to save and the last version that has been saved. This makes it possible to copy some changes made and reapply them. The red parts show what will be lost during the operation, while the green parts show what will replace them. | ||
| 7 | |Dropdown|You can compare multiple versions before making a decision.((( | ||
| 8 | * "Your current changes": the conflict is fixed by keeping your current changes. | ||
| 9 | * "Before your changes": discard both your edits and the latest saved changes. | ||
| 10 | * "Latest version saved": keep only the last saved version. | ||
| 11 | * "Custom version": manually enter text to resolve the conflict. | ||
| 12 | ))) | ||
| 13 | |Orange area|Marks where edit conflicts are found. | ||
| 14 | |Blue area|This area is reserved for the conflict resolution and displays text that will be used for fixing the conflict. You can see the text there changing for each choice in the dropdown. |
