Base-aware comparison merging
When using the base‑aware comparison as the basis for a merge operation, Rhapsody® DiffMerge shows the status of all the identified changes with respect to the base version of your configuration management tool. This additional information for the merging task avoids running more diff operations to pinpoint the source of differences.
When using the automatic merge feature in a base‑aware comparison, the developer only needs to define the merging required for the non‑trivial differences. See Automatic merging for base-aware comparisons for additional information about the merging capabilities in base‑aware comparisons. See Trivial versus non-trivial differences for an explanation of these concepts.