Object Repository Merge Tool - Multiple Merge Window

Relevant for: GUI tests and components

This window displays merge results of the selected local object repositories into the target shared object repository. The local object repositories are merged one by one into the shared object repository.

The active local object repository is treated as the primary object repository, and the shared object repository is treated as the target object repository.

To access

In the Object Repository Manager Main Window, select Tools > Update from Local Repository.

Important information

  • If you specified more than one action or component in the Update from Local Repository Dialog Box, UFT One performs multiple merges, merging each local object repository with the target object repository one at a time.

  • The image above shows the merge results of the first merge (the first local object repository being merged into the shared object repository).

  • The number of each merge set in a multiple merge is displayed in the title bar, for example, [Set 2 of 3].

  • When you click Save and Merge Next, the current merge is saved and cannot be modified without performing another merge.

  • The Ignore Object button is visible in the Merge Tool window only for a local object repository merge, and is only enabled when an object in the local object repository is selected.

  • If you are performing multiple merges, click the Save and Merge Next button in the Object Repository Merge Tool toolbar to perform the next merge (the next local object repository being merged into the shared object repository).

Relevant tasks

Update a shared object repository from a local object repository

The Object Repository Merge Tool - Multiple Merge window contains the following key elements:

Displays the objects that were added from the local object repositories to the shared object repository.

At the left of each object in the target object hierarchy is an icon that indicates the source of the objects:

UI Elements

Description

Indicates that the object was added from the local object repository.

Indicates that the object already existed in the shared object repository.

Displays the objects in the local object repository that you are currently merging. For details, see Update from Local Repository Dialog Box.

Provides source, conflict, and resolution details about the objects in the target object repository pane, and enables you to modify how a selected conflict is resolved. For details, see Resolution Options Pane.

In the Resolution Options pane, you can select from one of the following options:

  • Keep a specific object from the shared object repository and delete the conflicting object from the local object repository.

  • Keep a specific object from the local object repository and delete the conflicting object from the shared object repository.

  • Keep conflicting objects from both the shared object repository and the local object repository.

  • Ignore Object. Exclude a specific local repository object from the merge process so that it is not included in the shared object repository. The object is removed from the shared object repository and grayed in the local object repository tree. It remains in the local object repository when the merge is complete.

    Caution: The Ignore Object operation cannot be reversed. To include the object again in the merge process, you must repeat the merge by clicking Revert to Original Merged Files in the toolbar.