General preferences category

The ElementMatchRule preference specifies which rule Rhapsody DiffMerge will apply to match the elements within the units being compared.

Possible values:

• Default (default)
• Without Renaming Support

Select Default if you want Rhapsody DiffMerge to try to match elements by ID if there are not matches by name. This means that Rhapsody DiffMerge will be able to detect and report if an element has been renamed and has a different name on each comparison side.

Select Without Renaming Support if you want Rhapsody DiffMerge to match elements only by name. This means that two of the same elements in the same units (in the two Rhapsody projects you are comparing) will never be matched because they have different names.

To see an example of how you might use this preference, see Rhapsody DiffMerge match method.

The ResolveAutomaticallyWhenStartingMerge preference specifies whether Rhapsody DiffMerge must or must not resolve all trivial differences when doing a merge in a base-aware comparison

The Do you want to automatically merge trivial differences? message displays every time until a user selects Use my current reply as default. After that, Rhapsody DiffMerge will or will not resolve differences automatically without asking a user, for example, not displaying that message any more.

Possible values:

• Ask (default)
• Yes
• No

The ShowDMMarksinBaseAwareMode preference specifies what Rhapsody DiffMerge displays as the legacy difference and merging state marks when doing a base-aware comparison.

Default Value: Cleared

To see an example of how you might use this preference, see Results displayed for compare of three units.