However, if both units differ from the base unit, this is a non‑trivial or conflicting difference that must be resolved by the developer manually.
When textual differences on both sides of a base-aware comparison can be automatically resolved by IBM® Rational® Rhapsody® DiffMerge, then these differences are not considered to be conflicting differences. A textual attribute can be, for example, a primitive operation, code, or description text. For more information about the ability for Rational Rhapsody DiffMerge to automatically resolve textual differences, see the description for the BaseAwareAutoMergeableAttributes preference and the ItsBody value in TextDiffMerge preferences category.