Keywords

resolve DTR conflicts

Problem

Two different versions of the same file exist in the same workspace. Since they have no predecessor-successor relation, DTR cannot determine which version should become the active version.

Symptoms

After import of an SCA into a track, the DTR server reports conflicts for the respective workspace.

Solution

Please take a look at the documentation, how to resolve integration conflicts. You might also want to confer the following document on conflict resolution.