You can use the Version Tree
Browser to merge any two XML file versions that are visible in the version
tree, which can include branches outside your view.
To start a merge:
- Open your destination view.
This
is the view that contains the to-version of the merge. It also sets the branch
to which you will save the merged output.
- If the to-version is checked
out, check it in.
- In Rational® ClearCase® Explorer,
right-click the to-version and click .
- In the Version Tree Browser,
right-click the from-version and click .
An eye icon points to the latest version on your view's
branch.
- The cursor is now a target
icon. Click the to-version.
- In the Merge Confirmation window,
respond to the question, "Do you want to perform a merge?" by selecting
one of the following options.
- To perform the merge, click Yes.
- If you selected Yes, select or clear the Merge
the element graphically check box to indicate whether you want
to perform a manual or automatic merge.
- If the merge has been performed and you want to update the display, select No.
This action cancels merging and draws a merge arrow in the Version Tree Browser.
- Click OK to
start the merge operation.
Rational ClearCase XML
Diff Merge runs in one of the following ways:
- If you choose a manual merge, the XML Diff Merge window opens.
- If you choose an automatic merge, xmldiffmrg runs in
the background and attempts to resolve all differences. If a conflict occurs,
the XML Diff Merge window opens so that you can resolve it manually.