Three-way comparisons

Three-way comparisons show the differences between three versions of an instance. They are useful when modifications are merged or when there is a conflict during synchronization. Conflicts occur when two developers modify the same instance in the same stream. If they modify the same field in this instance and try to upload the modification, the first upload will be error free. However, the second upload will generate conflicts.

By default, the compare editor displays the local version and the server version that was modified by the other developer. However, the initial version on the server can also be displayed.

To see the details of the conflicts, the second developer can open the compare editor from the instance that is displayed as conflicting in the Pending changes view. The conflicting fields and their values are displayed. Conflicts must be resolved by merging the resources in the detail view of the compare editor.
Note: If two developers modified the same field by entering the same value in the same position, the field is displayed as conflicting.

To see the initial version on the server, you must click Show ancestor pane (Show ancestor pane) in the compare editor toolbar. A pane that contains the common ancestor of the two modified versions is then displayed. Click the button again to hide the ancestor pane.

Note: A three-way comparison can also be carried out between three instances. In this case, you must indicate the ancestor instance.

Feedback