You can customize the content of the Merged Result tree/list as well as navigate through changes in both the Merged Results tree/list and the Specification panel using the toolbar that is located at the top of the Merge window.
The toolbar buttons for customizing the Merged Results tree/list and navigating through changes are described in the following tables.
Button / Shortcut keys | Tooltip text | Description |
---|---|---|
Accept the selected change and go to the next change | Click to accept the selected element change and go to the next change (might be a property or the element). | |
Accept the selected change, its property changes and go to next change | Click to accept the selected element change together with the element property changes and go to the next changed element. | |
Accept the selected change, its property changes, all subelement changes and go to next change | Click to accept all changes from both contributors starting from the selected element and go to the next changed element (which is not a subelement). For example, if the root package Model selected, then all changes for the whole project will be accepted. | |
Reject the selected change and go to the next change | Click to reject the selected element change and go to the next change (might be a property or the element). | |
Reject the selected change, its property changes and go to next change | Click to reject the selected element change together with the element property changes and go to the next changed element. | |
Reject the selected change, its property changes, all subelement changes and go to next change | Click to reject all changes from both contributors starting from the selected element and go to the next changed element (which is not a subelement). For example, if the root package Model is selected, then all changes for the whole project will be rejected. | |
Alt + Home | Go To First Change | Click to select the first change. The button is not available if the first change is already selected. |
| Go To Previous Change | Click to select the previous change. |
| Go To Next Change | Click to select the next change. |
| Go To Last Change | Click to select the last change. |
| Go To Next Conflict | Click to select the next conflict. |
Annotate Merged Diagram | Click to turn on showing merged diagram annotations. | |
Report | Click to generate a Project Merge differences report in Microsoft Word format. | |
Options menu | ||
Icon | Option | Description |
> | Filter | Click to open the Select Element Type dialog. Clear the checkbox next to an element that you want to hide in the Merged Result tree/list. |
> | Show Elements from Used projects | Click to show or hide elements from used projects in the Merged Result tree/list. |
Show Source | Click to show or hide Source column in the Specification panel. By default, this column is shown. | |
Show Ancestor | Click to show or hide Ancestor column in the Specification panel. By default, this column is hidden. | |
Show Target | Click to show or hide Target column in the Specification panel. By default, this column is shown. | |
Show Merge Result Preview | Click to show or hide Show Merge Result Preview column in the Specification panel. This column shows final changes in the merged project and by default, this column is shown. | |
Summary/Legend | Click to show or hide the Summary/Legend panel. | |
Reset Windows Configuration | Select to place all tabs and windows to their default positions. |
Related pages
- Analyzing and managing merge results
- Getting merge summary information and changes legend
- Understanding content of the Merged Result panel
- Inspecting element property changes in the Specification panel
- Inspecting changes in the Change details panel
- Quickly navigating through conflicting changes
- Accepting and rejecting changes using shortcut menu
- Viewing and analyzing changes of modified diagrams
- Generating a differences report