Working in merging mode

This topic describes how to use the XML Diff Merge - Merging window to resolve differences between contributors.

The merge output pane is designed to help you detect differences and resolve them systematically. If you did not specify an automerge when you opened the Merging window, all differences are displayed as merge points in the output pane. If you specified an automerge, the merge points are unresolved differences that remain after the initial merge.

The recommended approach is to resolved merge points in a top-down fashion. One consequence is that only when a node is selected for output do its children become visible. Thus as you resolve merge points, you sometimes expose new conflicts that were initially hidden.

Use the following procedure as a general guide to manual merging:

  1. Click Next Unresolved Difference to select the first merge point. Hover your cursor over the merge point icon to display the hover help, which indicates the type of difference and its current resolution status.

    When you encounter differences with multiple locations, you can use the Next Location button to select each of its nodes.

  2. Resolve the current difference using one of the following methods:
    • Click one of the Merge from contributor buttons to select the current node in one of the contributors and insert the node in the merge output. You can only apply one contributor to an output node.
    • If the node is editable (the Edit tab is enabled), you can click Edit to edit the value directly.

    When you resolve a difference, the merge icon is replaced in the merge output pane by the value or placeholder that you select. All of the merge point locations for a move difference are resolved at once. In some cases, resolving a merge point exposes new nodes or merge points.

    To undo the resolution, clickMerge from contributor , which is currently selected. In the merge output, the node data is discarded and the merge point icon is restored.

  3. Repeat Steps 1 and 2 for each remaining merge point or difference, until all differences are resolved. To advance to the next merge point, click Resolve-and-Advance .
  4. You can change the result of resolved differences at any time. Using the Next Difference buttons to navigate, select a resolved difference. Then change the resolution by using either of the methods described in Step 1.
  5. If you resolve all merge points and are satisfied with the result document, click File > Save Merge. (This button is disabled until you resolve all merge points). Use the Save XML Merge Output window to save the merge output file. Rational® ClearCase® XML Diff Merge assumes the .xml file extension; if you omit the extension, it is added automatically.
  6. After saving the output file, use the Web browser view to display it.

Feedback