Automatically Detecting Integration Conflicts

Integration conflicts are reported between two versions of a resource automatically by the DTR if the version being integrated as a part of the activity is neither a predecessor nor a successor of the currently active version of the resource in the workspace.

Continuing with the previous example, in the ‘cons’ workspace the resource R1 is modified and a new version is created there (the first figure below shows the version graph of the resource). The same resource is also modified in workspace dev in the context of an activity A2 (the second figure below shows the version graph of the resource).

A resource was modified in workspace cons.

 

A resource was modified in workspace dev in the context of activity A2.

 

When you integrate an activity A2 in workspace ‘cons’, the DTR tries to integrate version 2 of resource R1, which was created in workspace ‘dev’, into workspace ‘cons’. In this case, the DTR detects an integration conflict. This is a conflict because the version being integrated is neither a predecessor nor a successor of the currently active version (version 1) in workspace cons:

This figure shows an integration conflict.

 

As the integration is done across workspaces, any such conflicts that occur are automatically detected and stored in the DTR. The DTR client displays these conflicts in the Conflict view.