Conflict Editor
Use
You use this editor to edit a version conflict that has occurred in an import. You can display the conflicting versions of an object. In particular, you can select a version for further 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, see 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
The functions in the conflict editor toolbar allow you to display the different object versions.
Pushbuttons in the Conflict Editor
Pushbutton |
Description |
Display Active Version |
Displays the currently active object version in a separate window. |
Display Imported Version |
Displays the imported object version that is causing the conflict. The imported object version is displayed when you call the conflict editor from the navigation area in the Integration Builder. |
Display New Version |
Displays the new version of an object. A new version is created when 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. ● In the event of a conflict, you select the conflicting version on the Conflicts tab page in the navigation area in the Integration Builder 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. In this situation,
you can edit the object version that was already editable but not the active
version. If the active version is displayed, the |
Select Displayed Version
|
Selects the object version displayed for further editing. |
