![]() |
![]() |
![]() |
![]() |
![]() |
![]() |
Control > MergeThis 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.
- Filename
A file pathname must be specified (in the File #1 or File #2 field) and a version indicator or number may be specified in the Version field. The version is selected from the current history of the file.
- Element
The fields Subsystem, Element, History, and Version must be specified.
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.
- Place Result into Field
Places the result in the specified file. By default, the file has the same name as File #1 with the suffix ".merged" appended.
- Place Result into File #1
Places the result back into File #1. The following additional options apply.
Options Tab
This tab contains various options controlling the merging process:
- Merge Tool Preference Option Menu
This option menu indicates whether the ClearCase merge tool is to be used. The remaining options that appear depend on which tool is selected.
- ClearCase Merge Tool Options
The following options are mutually exclusive and apply only when Graphical is selected.
The remaining radio buttons always apply whether or not Graphical is selected:
- Perform a Selective Merge
Merge only those changes from each contributor version that were applied to it's immediate predecessor version to create that contributor version. (This is the ClearCase -insert option). This is mutually exclusive with the Create Merge Arrow and Perform a Subtractive Merge options.
- Perform a Subtractive Merge
Remove the changes to File #1 donated by the other contributors. (This is the ClearCase -delete option). This is mutually exclusive with the Create Merge Arrow and Perform a Selective Merge options.
Ancestor Tab
The are three choices for specifying the common ancestor version (known the "base contributor" in ClearCase):
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.
- Additional merge contributor files Field
This is a list of filenames of additional contributors to the merge. Each filename designates the current version of the file.
- Additional merge contributor versions Field
This is a list of full version names of additional contributors. (See Version and Element Names.)
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
Rational Software Corporation http://www.rational.com support@rational.com techpubs@rational.com Copyright © 1993-2001, Rational Software Corporation. All rights reserved. |
![]() |
![]() |
![]() |
![]() |
![]() |
![]() |
![]() |
![]() |