In the Object Repository Merge Tool Main Window, do one of the following:

• Select Tools > Settings, and select the Resolution tab.

• Click the Settings button in the toolbar, and select the Resolution tab.

• The resolution settings are relevant only for test objects. Conflicts between checkpoint or output value objects with the same name but different content are always resolved by merging both objects into the new repository and renaming one of them.

• When updating a shared object repository from a local object repository, the object repositories are referred to as the Local and Shared object repository.

• If you make any change to the resolution settings while a merged object repository is open, you are asked whether you want to merge the open files again with the new settings. If you click No, the new settings apply only to future merges.

• Merge two shared object repositories

• Update a shared object repository from a local one

Specifies how to resolve conflicts in which two test objects have the same name, but their descriptions differ. You can specify that the target object repository takes the test object description that is more generic or less generic, as follows:

• More generic. Instructs the Object Repository Merge Tool to take the test object that has fewer identifying properties than the test object with which it conflicts, or uses regular expressions in its property values. This is the default setting.

• Less generic. Instructs the Object Repository Merge Tool to take the test object that has all the identifying properties of the test object with which it conflicts, plus additional identifying properties.

Specifies how to resolve conflicts where two test objects have the same or similar descriptions, but their names differ. You can select the source from which the target test object repository takes the object name, as follows:

• Primary repository file. The target object repository takes the test object name from the test object in the primary object repository. This is the default setting. (When updating a shared object repository from a local object repository, this option is for the Local object repository.)

• Secondary repository file. The target object repository takes the test object name from the test object in the secondary object repository. (When updating a shared object repository from a local object repository, this option is for the Shared object repository.)

• Same file as the object description. The target object repository takes the object name from the object in the same object repository from which it took the object description.