Starting a merge from Merge Manager

Merge Manager is useful when you need to merge multiple files or if you are not sure which files need merging. Merge Manager can find elements that need merging in your view or project, and allows you to merge one or more of them. It automatically runs the appropriate merge tool for each type of element; it runs Rational® ClearCase® XML Diff Merge for XML files.

Note: Merge Manager is run directly only in base ClearCase. In UCM views, use the deliver operation to start a merge.

To start a merge using Merge Manager:

  1. Open Merge Manager. For example, right-click a Rational ClearCase view. Then click ClearCase > Merge Manager.
  2. In Merge Manager, start the Find wizard by clicking New in the Welcome window.
  3. Follow the prompts in the Find wizard to select a range of elements and choose merge options.
  4. Merge Manager lists the elements that need merging. In the window that is displayed, choose one of the following options:
    • To merge all the elements in the list now, click Yes.
    • To cancel merging, click No. This option gives you the opportunity to selectively merge XML elements as follows:
      1. Select one or more XML elements in the Merge Manager element list.
      2. Click Merge > Merge Elements.
      3. If the element must be checked in, the Confirm Element Checkin window prompts you to allow Merge Manager to check the element in. Confirm the checkin.
      4. In the Start Merge window, enter merge comments.
      5. Select checkout options.
      6. In the Merge options window, indicate whether you want to perform a graphical merge.
        • Click Yes to merge manually.
        • Click No to merge automatically.
      7. Click Ok.

If you choose an automatic merge, XML Diff Merge runs in the background and attempts to resolve all differences.

If you choose to perform a manual merge or if an automatic merge encounters a conflict, the XML Diff Merge window is displayed, where you can resolve the conflicts manually.


Feedback