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 available only on CVS command-line filesystems.
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 the Control key 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 |