merge

To merge is the process of combining the contents of two or more files into a single new file. Typically, the files are versions of a single file element.

A merge condition is created when multiple users have checked out the same version of a file. Each user makes changes and checks in the file. The first user to check in the file creates a new version. The second user to check in the file is required to merge. If ClearCase can manage combining the multiple edits to the file, the changes are merged into a new version of the file automatically. If the edits conflict or cannot be resolved, users must resolve the conflicts. ClearCase starts the Diff Merge tool, in which you can view the differences and merge two or more files, if necessary.

Terms of use | Feedback
(C) Copyright IBM Corporation 2002, 2004. All Rights Reserved.