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.
In the current scenario there are two tracks in the lanscape.
Checking for conflicts in DTR.
Logon to the DTR with theuser id which has admin credentials and on the right most corner there will be symbol for conflict search.
Click on the conflict serach and select the workspace, conflict state and click on show.
The open conflicts in the selected workspace are shown below.
Procedure to resolve the conflicts.
Open the NWDS. Logon to the track (the track with the conflicts) with the logon credentials.
Open the view integration conflicts. In this view we will be able to see the conflicting files in red under each DC.
To accept the active version, it asks for an activity. So create an activity.
When we click on OK. The conflicts in the inactive would be resolved. When we check in the activity back then the conflicts in the active also would be resolved.
Once the activities are checked in and deployed, there will be no more conflicts in the integration conflicts view. Import the SCA along with newly created activity and SCA will be deployed successfully in the next landscape.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
User | Count |
---|---|
6 | |
5 | |
5 | |
5 | |
5 | |
4 | |
4 | |
4 | |
3 | |
3 |