Merging workflow using Rational ClearCase XML Diff Merge

The purpose of a merge operation is to resolve differences between two or more contributors, and save the result in a merge output file.

  1. Begin a merge in one of the following ways:
    Start a merge from Description
    Merge Manager Find a range of ClearCase elements that need merging. You can invoke Merge Manager explicitly, or as part of a UCM deliver operation.
    Version Tree browser Select two contributors (ClearCase elements) from the Version Tree Browser.
    XML Diff Merge Open Rational® ClearCase® XML Diff Merge as a standalone application to merge any set of contributors, including those outside of ClearCase version control.

    All contributors must be well-formed XML. If an XML error is detected, the XML Diff Merge Parse Error window opens.

    If you perform a complete automatic merge (one with no unresolved differences or conflicts), XML Diff Merge saves your merged output. You can omit the remaining steps in this procedure.

    If you choose a graphical merge, or if your automatic merge fails to resolve all differences, the XML Diff Merge - Merging window opens.

    Tip: The first three methods take advantage of the Rational ClearCase integration with XML Diff Merge to automate certain functions and are usually the easiest to use when you work with Rational ClearCase elements. If the set of files to be merged includes any XML files, the Rational ClearCase type manager starts xmldiffmrg to process those files.

    By contrast, stand-alone mode allows you to merge any XML files in your file system, and requires you to explicitly control most functions.

  2. Use the Merging window to view the contributors and resolve differences manually.
  3. When all conflicts are resolved, click File > Save to save the merge output.
Tip: By default, Rational ClearCase XML Diff Merge uses ID attributes when matching nodes. These settings cannot be changed on the xmldiffmrg command line or in other ClearCase tools that use the type manager. However, you can start a standalone XML Diff Merge session and modify the ID matching settings in the Options window. When you exit XML Diff Merge, your settings are saved in the Windows registry.

Feedback