Resolving Check-In Conflicts 

When resolving check-in conflicts, the following terms are used for the conflicting versions:

·        Active/Remote version: The version of the resource that is currently active in the workspace as a result of parallel changes made to the resource.

·        Local/Conflicting version: The version of the resource in the client workspace.

·        Base version: The common ancestor version.

Prerequisites

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

Procedure

The dialog window Checkin Error displays the following possible options for resolving the conflict:

...

·        Merging the conflicting versions: This option allows the user to merge the contents of the conflicting versions. The merge tool specified in the Window ® Preferences ® Team ® DTR Preferences is used for carrying out the process of merging, provided it is suited for the file type.

§         ...

                            a.      Select the conflicting file in the Open Activities view under the activity whose check-in has caused the conflict.

                            b.      To merge the contents, in the context menu choose Merge…

The contents of the local version are overwritten by the result of the merging of the two conflicting versions. When the activity is checked in, it becomes the head version of the resource in the workspace.

·        Accepting the local file:

§         ...

...

                            a.      Select the conflicting file in the Open Activities view under the activity whose check in has caused the conflict.

                            b.      To accept the local file, in the context menu choose Accept Local (Yours)

This accepts your version of the resource as the most recent version of the resource. When the activity is checked in, your version becomes the head revision of the resource.

·        Accepting the remote version:

§         ...

...

                            a.      Select the conflicting file in the Open Activities view under the activity whose check in has caused the conflict.

                            b.      To accept the remote version,  in the context menu choose Accept Remote (Active Version)’

This accepts the currently active version as the most recent version of the resource. This overwrites your version in the client workspace.

Result

Following any one of the above methods resolves the conflict and the activity can be checked in.