Fix each Conflict Individually
Last modified by Eleni Cojocariu on 2026/03/19 08:02
Content
Steps
Resolving conflicts has several ways to resolve an edit conflict, allowing also the advanced option of fixing each conflict individually:
| Part | Description |
|---|---|
| Differences in the content | 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. |
| Dropdown | You can compare multiple versions before making a decision.
|
| Orange area | Marks where edit conflicts are found. |
| 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. |
