Resolving Integration Conflicts

There are three ways of resolving integration conflicts:

·        Merging the two conflicting versions

·        Accepting the active version (in the Repository)

·        Accepting the colliding (local) version

Merging the Two Conflicting Versions

An integration conflict can be resolved by merging the contents of the two conflicting versions. A new version is created in the target workspace in the context of an activity, which is used to resolve the conflict.

The contents of the new version are the result of merging the conflicting versions.

The figure below shows version 2 created in workspace 'cons' as a result of the merging of contents of version 2 of workspace 'dev' and version 1 of workspace 'cons'. The merge arrow as shown in the figure depicts that the resultant version is a successor of both conflicting versions.

Resolution of an integration conflict by a merge of the conflicting versions.

 

Version graph after checking in the conflict resolution activity.

Accepting the Active Version (in the Repository)

A new version is created in the current workspace whose contents match those of the current version.

Accepting the Colliding (Local) Version

A new version is created in the current workspace whose contents match those of the colliding local version.