Elements with all change types are displayed in the Merged Result tree/list that is located at the top left of the Merge window.

You can also filter the elements displayed in the Merged Results tree/list by type of changes. Use the Changes filter drop-down list to filter out a specific type of changes. 

Choosing change type for displaying changes in Merged Results tree


Understanding element marking

When a change occurs on a single element, the ticks and crosses before element icon indicate the state of the change which can be either accepted or rejected.

Marking

Change state

Example


(green tick before the element icon)

Accepted


A new element had been created in one of the contributors and its addition was accepted.


(red cross before the element icon)

Rejected


A new element had been created in one of the contributors and its addition was rejected.


To understand the concept of change states, refer to Change states.

Elements with resolved conflicting changes are marked as shown in the following table. Owners of these elements are also marked.

Marking

Change applied by

Example


(red diamond on the lower-left corner of the element icon)

System


The element had a conflicting modification change which was resolved automatically by choosing the target.


(yellow diamond on the lower-left corner of the element icon)

User

 

The element had a conflicting modification change which was resolved by the user.


Recognizing addition changes

For the addition change description, refer to Addition change.

Added elements are highlighted in green background.

Example of accepted addition change


Recognizing deletion changes

For the deletion change description, refer to Deletion change.

Deleted elements are highlighted in red background.

Example of deletion change

Recognizing modification changes

For the modification change description, refer to Modification change.

Elements whose properties have been changed are highlighted in blue.


To see what properties have been modified, click the element and see changes in the Specification panel.

For more information about using the Specification panel, see Inspecting changes in the Change details panel.


Recognizing movement changes

For the movement change description, refer to Movement change.

Elements with movement changes are highlighted in the same blue background that is used to highlight modification changes. Since movement changes are some kind of modification changes. Icon of an element with movement changes is represented with an arrow symbol on the left.

Example of accepted movement change

You can navigate from the element original location to the new one (and vice versa) using the commands on the element shortcut menu.



Recognizing order changes

For the order change description, refer to Order change.

Elements with order changes are highlighted in the same blue background that is used to highlight modification changes, since order changes are some kind of modification changes.
After accepting the change, all the elements in the collection are reordered so that it would be the same as in one of the contributors.

Example of accepted order change

You can turn off the order changes detection. For more about it, see Turning on showing merged diagram annotations.


Recognizing elements with changed owned elements
Elements whose owned elements (in any nesting level) have changes are highlighted using red diagonals.

Element with owned elements added


Related pages