
You work in the Design Time Repository perspective in the SAP NetWeaver Developer Studio.
A connection to the Design Time Repository (DTR) server is obtained.
From the context menu, choose Resolve Integration Conflict. Choose one of the following options:
A dialog window Activity Selection is displayed.
After you select/create an activity, a new version is created for the resource with the contents of the conflicting version.
A dialog window Activity Selection is displayed.
After you select/create an activity, a new version is created for the resource in the current workspace with the contents of the active version.
A dialog window Activity Selection is displayed.
After you create/select an activity, a new version of the resource is created. The merge tool appears; you use it to merge the contents of the two conflicting versions.
For more information about using external tools, see Setting Preferences of the Design Time Repository .
In the version graph, a discard arrow is created that marks the file version already stored on the server as the active version.
In the version graph, a discard arrow is created that marks the new file version as the active version.
Check in the activity.
Checking in the activity solves the conflict between the two versions and determines the active version in the workspace.