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.