Merging Branches
8/33
Using Branches
Trading Branches
Merging a Branch
•
In a checked out copy of the trunk:
•
cvs update -j more-purple
•
Review changes, resolve conflicts
•
cvs commit -m "merged more-purple"
