The Merge command in the CVS commands submenu lets you merge your working copy of a file
with earlier revisions of the file. The CVS command-line equivalent to the Merge
command is cvs update -j
. You can merge your working revision with an earlier revision,
with a revision on a different branch, or with the difference between two earlier revisions.
The Merge command is only available on CVS command-line filesystems. For more information about merging files with CVS, consult your CVS documentation.
To use the Merge command from the Explorer:
To use the Merge command from the Versioning Explorer:
To merge the difference between two revisions into your working copy, hold down Ctrl and select the two revisions, then right-click one of the revisions and choose Merge With Rev. Differences.
See also | |
---|---|
Mounting a CVS Filesystem Calling CVS Commands CVS Commands Saving Advanced CVS Command Options Reconfiguring a CVS Filesystem Global Settings for VCS Filesystems |