![]() |
![]() |
![]() |
![]() |
![]() |
![]() |
CM > Merge (Apex/ClearCase)The CM > Merge command merges the contents of two or more files, or two or more directories. Typically the files are versions of the same file element. A directory merge must involve versions of the same directory element. You can also perform a subtractive merge, which removes from a version the changes made in one or more of its predecessors.
Command Line Interface: cleartool merge
Please see the ClearCase User's Manual for more details.
The CM > Merge command displays the ClearCase Merge dialog box.
ClearCase Merge dialog box fields:
Objects to Merge list field:
The list field displays the names of files and/or directories to merge.
Use the Add input field to add file names or directories to the list field. Use the Remove or Clear buttons to delete entries from the list.
Merge Type radio buttons:
- Standard merge
- Selective (insert) merge
A selective merge adds to the checked-out version the changes made in one or more other versions.
- Subtractive (delete) merge
A subtractive merge removes from the checked-out version the changes made in one or more of its predecessors.
Destination of Merge Output type radio buttons:
- View-private file (not used as contributor) - file must not exist
Select this option to perform a merge that does not overwrite any of its contributors. An error occurs if the Merge Output file or directory element already exists.
- Controlled file (or directory element) - (contributor to merge)
Select this option to have the Merged Output field be a version of a file or directory element to be the merge target: one of the contributors to the merge, and also the location where the merged output is stored.
Destination of Merge Output field:
File or directory to contain the merged output.
User interaction controls radio buttons:
- Prompt only on conflict
Turns off automatic merging for non-trivial merges and prompts you to proceed with every change in the from-versions. Changes are automatically accepted unless a conflict exists.
- prompt for every change
Prompts the user before making each change.
- prompt for every non-trivial change
Prompts the user before making each non-trivial change. Changes are automatically accepted unless a conflict exists.
- cancel command unless completely automatic merge
Cancels the command instead of engaging in a user interaction; a merge takes place only if it is completely automatic.
Suppress parts of merge process check boxes:
By default, the Merge command stores its results in the workspace location specified by Destination of Merge Output file. It also creates merge arrows (hyperlinks of type Merge).
- Suppress merge, but creates the corresponding merge arrows
Suppresses the merge, but creates the corresponding merge arrows.
- Perform merge, but suppresses the creation of merge arrows
Performs the merge, but suppresses the creation of merge arrows.
Comment options radio buttons:
- No Comment
There is no user-supplied comment. This will override the default comment specified in $HOME/.clearcase_profile.
- Comment
When selected, displays a comments text box. The entered text will override the default comment specified in $HOME/.clearcase_profile.
- Comment file
When selected, displays a Comment Filename file selection field. The contents of this will will override the default comment specified in $HOME/.clearcase_profile.
Additional Topics
Rational Software Corporation http://www.rational.com support@rational.com techpubs@rational.com Copyright © 1993-2001, Rational Software Corporation. All rights reserved. |
![]() |
![]() |
![]() |
![]() |
![]() |
![]() |
![]() |
![]() |