Making merge decisions

You often must make decisions about what needs to be merged and how it must be merged.

After starting a merge operation, developers might use the automatic merging capabilities to resolve trivial, non‑conflicting differences. You can use the following tools to help you decide and manually merge the non-trivial differences:

If a base‑aware comparison is being used, Rational Rhapsody DiffMerge has more information about the left and right units. It is likely that the developer might need to make fewer manual merges with a three‑unit (base‑aware) comparison than with a two‑unit comparison.

Viewing elements in the Undecided view

To view differing elements that are not in or out of the merge for either type of comparison, choose View > View undecided. This view shows only the remaining, unmerged differences. In other words, those differences that are not yet "in" or "out" of the merge. Units are not displayed that you have either explicitly marked as "in" or "out" of the merge or are always implicitly in the merge.

Viewing elements in the merge

To view only those elements that are currently in the merge with either type of comparison, choose View > View in merge to display only those elements that are currently in the merge (without recognition of the method used to include the element in the merge) are displayed.


Feedback