Resolving Integration Conflicts 

Prerequisites

You are using the DTR Eclipse client and are connected to the DTR server.

Procedure

...

       1.      To resolve an integration conflict, in the context menu choose Resolve Integration Conflict.

       2.      Choose one of the following options:

...

                            a.      Accept the Conflicting Version:

                                                  i.       To accept the conflicting version, in the context menu choose Accept Conflicting Version.

A dialog window Activity Selection is displayed.

                                                ii.       Create a new activity or select one from the list of existing open activities.

After an activity is selected/created, a new version is created for the resource with the contents of the conflicting version.

                                               iii.       Check in the activity. Checking in the activity resolves the collision between the two versions.

                            b.      Accept the Active Version:

                                                  i.       To accept the active version, in the context menu choose Accept Active Version.

A dialog window Activity Selection is displayed.

                                                ii.       Create a new activity or select one from the list of existing open activities.

After an activity is selected/created, a new version is created for the resource in the current workspace, with the contents of the active version.

                                               iii.       Check in the activity. Checking in the activity resolves the collision between the two versions.

                            c.      Merge versions:

                                                  i.       To merge the contents of the conflicting versions, in the context menu choose Merge….

A dialog window Activity Selection is displayed.

                                                ii.       Create a new activity or select one from the list of existing open activities.

After an activity is selected/created, a new version of the resource is created. The merge tool specified in Window  ®  Preferences  ®  Team  ®  DTR Preferences  is displayed to carry out the process of merging the contents of the two conflicting resources.

                                               iii.       Save the merged changes of to the newly created version

       3.      Check in the activity.

Result

Checking in the activity resolves the collision between the two versions and makes the merged version as the new active version in the workspace.