You can accept and reject changes using the toolbar that is located at the top of the Merged Result window or using the shortcut menu in all panels. 

The following table lists the commands of the shortcut menu that can be opened when an element is selected in the Merged Result tree/list.

Command

Description

Accept

Click to accept the selected change. If the change has equivalent changes, they are accepted too.

Reject

Click to reject the selected change. If the change has equivalent changes, they are rejected too.

Accept With Properties

Click to accept the selected change and its property changes.

Reject With Properties

Click to reject the selecting change and its property changes.

Accept Recursively

Click to accept the selected change, its property changes, and all owned element changes in the Merged Result tree view.

Reject Recursively

Click to reject the selected change, its property changes, and all owned element changes in the Merged Result tree view.

Mark as Resolved

Click to mark the conflicting change as resolved by the user, but not automatically.

Select Original Location(s)

If the selected instance of a moved element is in the new location, the Select Original Location(s) command appears on the shortcut menu. Click it to navigate to and select the original location(s) of the moved element in the Merged Result tree.

Select New Location(s)If the selected instance of a moved element is in its original location, the Select New Location(s) command appears on the shortcut menu. Click it to navigate to and select a new location(s) of the moved element in the Merged Result tree.

Related Pages: