About trivial and nontrivial merges

DevOps Code ClearCase® performs two types of merges: trivial and nontrivial merges.

• Trivial merges. In a trivial merge operation, the base contributor and the contributor to which you are merging are the same. In the comparison and merge tools, the base contributor is the element against which all other contributors are compared when reporting differences. DevOps Code ClearCase resolves any trivial merges without your intervention.
• Nontrivial merges. Differences between the base contributor and contributors are such that your manual intervention is required to resolve the differences. When encountering such differences, DevOps Code ClearCase will prompt for your resolution.