Relevant for: GUI tests and components
This task describes how to merge two shared object repositories according to predefined settings that define how conflicts between objects are resolved.
Make sure that a GUI test or component is in focus.
Make sure that the Object Repository Manager window is open.
Make sure the resolution and color settings are configured to match your needs.
- In the Object Repository Manager window, select Tools > Object Repository Merge Tool to open the Object Repository Merge Tool. The New Merge Dialog Box opens.
- Specify the two object repository files you want to merge.
After the merge is complete, you can view the results summary in the Merge Statistics Dialog Box (Object Repository Merge Tool).
Review and analyze the merge between the repositories in the Object Repository Merge Tool Main Window.
Change the view presented by the Object Repository Merge Tool according to your working preferences, by dragging the edges of the panes to resize them, or selecting the appropriate option from the View menu.
Filter the objects and show only the objects that you want to view by using the Filter Dialog Box (Object Repository Merge Tool).
Locate one or more objects in a selected object repository whose name contains a specified string using the Find Dialog Box (Object Repository Merge Tool).
If one or more of the merge resolutions does not match your needs, follow the steps below to adjust them:
In the target object repository, select an object that had a conflict, as indicated by the icon to the left of the object name. The conflicting objects are highlighted in the source object repositories.
A description of the conflict and the resolution method used by the Object Repository Merge Tool is described in the Resolution Options pane. A radio button for each possible alternative resolution method is displayed.
In the Resolution Options pane, select a radio button to choose an alternative resolution method. The target object repository is updated according to your selection and redisplayed.
In the Resolution Options pane, click the Previous Conflict or Next Conflict buttons to jump directly to the next or previous conflict in the target object repository hierarchy.
When the object conflicts are resolved satisfactorily, save the new merged shared object repository.