TOC PREV NEXT INDEX DOC LIST MASTER INDEX




Control > Merge

This command combines the contents of two files into a result file. The ClearCase merge tool may be used. The merge may be based on a specified common ancestor version of the files.

When the ClearCase merge tool is used, a ClearCase merge editor window (titled Cleardiff) may be displayed and used to resolve conflicts. This window is described in Cleardiff Difference and Merge Windows. For the ClearCase merge tool, the files to be compared must be stored in a ClearCase view.

Merge Dialog Box Fields

Filename/Element Fields

These fields specify objects to be merged (which are called "contributors" to the merge). Each object may be identified using a filename or element name by selecting the appropriate radio button.

For an uncontrolled object, the Filename option must be used. The Version field is ignored in this case.

Exchange #1 and #2 Button

This button exchanges the two objects to be merged. This affects the annotations in the result file and format of merge editor window.

Result Tab

This tab specifies the result file to be produced.

Options Tab

This tab contains various options controlling the merging process:

The following options are mutually exclusive and apply only when Graphical is selected.

Query only on Conflicts


Query the user in the merge editor window only when there are conflicting changes among the contributors with respect to the common ancestor. (This is the ClearCase default.)


Query only on Contributor Differences


If the result file is File #1, accept non-conflicting changes from that file automatically. Query the user for all conflicing changes and all changes from contributors other than File #1. (This is the ClearCase -query option.)


Query on All Changes


Query the user about every difference between a contributor and the common ancestor. (This is the ClearCase -qall option.)


The remaining radio buttons always apply whether or not Graphical is selected:

Ancestor Tab

The are three choices for specifying the common ancestor version (known the "base contributor" in ClearCase):

Compute Common Ancestor Automatically


Use the version tree of the element to find a common ancestor version for all of the contributor versions. This option may also be set when there is no common ancestor.


Filename


The specified File and Version fields identify the common ancestor (in the current history of the file).


Element


The specified Subsystem, Element, History, and Version fields identify the common ancestor.


Other Files and Other Versions Tabs

When the ClearCase tool is used, there may be more than two contributor files. These tabs are used to specify additional contributors.

Merge Editor Windows

ClearCase

When the ClearCase merge tool is used and the Graphical option is set, a ClearCase merge editor window with the title "Cleardiff" is displayed to view and resolve changes. See Cleardiff Difference and Merge Windows for information about using this editor window.

Command Line Interface: merge

Additional Topics

For more information, click on a topic:


Rational Software Corporation 
http://www.rational.com
support@rational.com
techpubs@rational.com
Copyright © 1993-2001, Rational Software Corporation. All rights reserved.
TOC PREV NEXT INDEX DOC LIST MASTER INDEX TECHNOTES APEX TIPS