Entering content frame

Background documentation Integration Conflict Locate the document in its SAP Library structure

An integration conflict occurs, 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 target workspace.

The figure below shows an integration conflict.

This graphic is explained in the accompanying text

A resource MyClass.java is created in workspace WS_a as version a1 and changed, so that versions a2 and a3 are generated. In addition, it is integrated into workspace WS_b (still, the same physical file ist used) and again changed: b1 and b2 are created.

Integrating version a3 in workspace WS_b triggers a conflict, because a3 and b2 are versions of the same file MyClass.java, but neither predecessor nor successor of one another: It is not clear which version is meant to be active in WS_b.

For more information, see Resolving Integration Conflicts.

 

 

 

 

Leaving content frame