Merging -- CVS---Concurrent Versions System



Next: Recursive behavior Prev: Branches Top: Top

8. Merging

You can include the changes made between any two revisions into your working copy, by merging. You can then commit that revision, and thus effectively copy the changes onto another branch.

Menu

Merging a branch
Merging an entire branch
Merging more than once
Merging from a branch several times
Merging two revisions
Merging differences between two revisions


Next: Recursive behavior Prev: Branches Top: Top