Integration Conflicts
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 following figure shows an integration conflict:
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 is 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 a predecessor nor a successor of one another: it is not clear which version is meant to be active in WS_b.
You can check for conflicts in SAP NetWeaver Developer Studio → Design Time Repository perspective → Integration Conflicts view.
See also: