Show TOC

 Resolving Integration ConflictsLocate this document in the navigation structure

Prerequisites

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.

Procedure

From the context menu, choose Resolve Integration Conflict. Choose one of the following options:

  • To accept the conflicting version, in the context menu choose Accept Conflicting Version.

A dialog window Activity Selection is displayed.

  1. Create a new activity or select one from the list of existing open activities.

    After you select/create an activity, a new version is created for the resource with the contents of the conflicting version.

  2. Check in the activity. Checking in the activity resolves the collision between the two versions.
  • To accept the active version, in the context menu choose Accept Active Version.

A dialog window Activity Selection is displayed.

  1. Create a new activity or select one from the list of existing open activities.

    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.

  2. Check in the activity. Checking in the activity resolves the collision between the two versions.
  • To merge the contents of the two conflicting versions, in the context menu choose Merge... or Auto Merge...

A dialog window Activity Selection is displayed.

  1. Create a new activity or select one from the list of existing open activities.

    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.

  2. Save the merged changes of to the newly created version.
    Note

    For more information about using external tools, see Setting Preferences of the Design Time Repository .

  • Discarding versions: Versions are not deleted, but they are no longer effective because a different version was selected as the active version.
    • Discard Conflicting Version: to discard your version, choose Discard Conflicting Version.

      In the version graph, a discard arrow is created that marks the file version already stored on the server as the active version.

    • Discard Active Version: to discard the server version, choose Discard 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.

Result

Checking in the activity solves the conflict between the two versions and determines the active version in the workspace.