The following terms are used in Rational® ClearCase® XML
Diff Merge.
- base version
- The contributor against which each of the other contributors is compared
to detect differences.
- conflict
- A difference that cannot be resolved by an automerge, and must be resolved
by a user. Involves multiple differences at the same node whose resolution
is ambiguous.
- contributor
- A file or version that participates in a compare or merge operation. Typically,
contributors are multiple versions of the same XML file.
- difference
- A variance between a matched node in the base version and another contributor.
- from-version
- In Rational ClearCase merge
operations, any contributor except the to-version. The term is not used in Rational ClearCase XML Diff
Merge
- hidden node
- A difference node whose location cannot be shown in the merge output display
until a difference in an ancestor node is resolved.
- merge
- The combining of the contents of two or more files into a single new file.
- merge output
- The output of a merge operation. Once you have resolved any conflicting
differences between contributors, you can save the merged contents into the
merge output file. In ClearCase merges, the merge output file is typically
written to the CHECKEDOUT version of the contributor to which you are merging.
In standalone mode, you specify the output file.
- merge point
- An unresolved difference in the output pane of the Merging window. You
must resolve all merge points in order to save a merge output version.
- node
- An element, attribute, or other XML item in the XML Diff Merge data display.
- placeholder
- A pseudonode created by XML Diff Merge to display the same number of nodes
in all contributors. When a node is added, deleted, or moved, a placeholder
is inserted into the contributor where the node is missing.
- to-version
- In automatic merges, the version from which differences are applied to
the merge output file.
- unresolved difference
- In a merge, any difference that has not yet been resolved; in a compare
operation, a difference that would be a conflict in an automerge.
- whitespace
- Space, tab, or end of line characters. You can choose different glyphs
to display for each character.