Merging window controls in Rational ClearCase XML Diff Merge

All the menu and toolbar functions available in comparing mode are available in the Rational® ClearCase® XML Diff Merge - Merge window. However, some functions are specific to merging:

Difference navigation controls

Use the menu and toolbar commands described in Table 1 to step through differences.

Table 1. Controls in the Merge window
Menu command Toolbar button Description
Navigate > Next Unresolved Difference Step forward to the next unresolved difference.

If the difference is inside a collapsed level, the level is expanded to reveal the merge point.

If the difference is not yet resolved, this is a merge point in the output pane. If resolved, it is displayed as a difference node with the result value.

Navigate > Previous Unresolved Difference Step back to the previous merge point.

If the difference is not yet resolved, this is a merge point in the output pane. If resolved, it is displayed as a difference node with the result value.

Navigate > Next Difference Step forward to the next difference node.

The corresponding difference node is selected in the contributor panes

Navigate > Previous Difference Step back to the previous difference node.

The corresponding difference node is selected in the contributor panes

None Merge from contributor toggle buttons.
  • Click on to apply the value of the current difference from the indicated contributor to the merge point. The merge point icon is removed.
  • Click off to remove the value. The difference is unresolved, and the merge point icon is displayed again.

This is one of the main ways to resolve merge points manually. The other method is to edit the value directly on the Edit page.

Navigate > Resolve-and-Advance mode Set to automatically advance to the next merge point each time you resolve a conflict.

Any intervening nodes are skipped, including differences.

Pane synchronization

Contributor panes are tightly synchronized in the Merging window just as in the Comparing window: they expand, collapse, and scroll together. Placeholders are inserted to maintain alignment.

The merge pane is also synchronized with the contributor panes, but it is sometimes useful to control them separately. For example, you can scroll the merge pane to a different place than the contributors, and expand or collapse them differently. In general:

Document view controls

In addition to the document view controls available in viewing mode, the Merging window provides the following function:
Table 2. Document view control in Merging window
Menu command Toolbar button Description
File > Merge as text None Open your contributors in the Diff Merge tool, where you can complete your merge. Your data is displayed as text instead of a structured node tree.

The Diff Merge operation fails if your XML text file:

  • Has lines that are too long (over 3000 characters).
  • Is encoded with UTF16.

Feedback