You can merge your working your working copy of a file or directory with an earlier revision, with a revision on a different branch, or with the difference between two earlier revisions. The CVS command-line equivalent to the Merge command is cvs update -j.
To perform a merge from the Filesystem window:
To perform a merge from the Versioning window:
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.
For more information about merging files with CVS, consult your CVS documentation. CVS documentation is available from:
http://www.cvshome.org/docs/manual
See Also | |
---|---|
Resolving Merge Conflicts Creating and Applying a Patch Comparing File Revisions Visually Versioning Window |