Conflict Editor 

Use

You can use this editor to edit version conflicts. You can display the conflicting versions of an object. You can select a version for additional processing and reject the other versions.

Prerequisites

You can access the conflict editor in the following situations:

·        You open an object for which a version conflict exists in a change list.

·        You open an object on the Conflicts tab page in the Integration Builder navigation area (only in the Integration Repository, refer to Conflicts when Importing Objects).

·        You open an object for which a version conflict exists on the Objects  tab page in the Integration Builder navigation area (only in the Integration Repository).

Features

You can access the following functions from the application toolbar in the conflict editor:

·        Display active versions

This displays the active version in a separate window. This enables you to display and edit the conflicting and active versions in parallel.

·        Display conflicting versions

Displays the conflicting object versions.

Conflicting versions are displayed if you access the conflict editor from the navigation area in the Integration Builder.

·        Display new versions

Displays the new version of an object. A new version is created if you edit a version that is involved in a conflict and has already been closed. This is possible in the following situations:

¡        You select the active version and then edit this.

¡        You select the conflicting version for conflicts from the Conflicts tab page in the Integration Builder navigation area and edit this version.

The system generates a new object version here whose content is based on the version selected previously. You have the option of toggling between three versions. The new version is then the result of combining the conflicting versions.

A new version cannot be created if the conflict was generated during activation of a change list. In this case, the entire change list is rejected. This means that all objects in the change list can still be edited. You can edit object versions that were already editable but not the active versions in this situation. If the active version is displayed, the Display/Changebutton ()is not active.

·        Select displayed version

Selects the object version displayed for subsequent editing.

The system displays the object editor in the bottom half of the screen for each object version selected.