Add new comment

Merging changes from branch to trunk

Submitted by Dirk on 29 May, 2007 - 18:28
cvs up -A
cvs diff -r branchname
cvs up -j branchname
cvs ci -m "merged changes from branchname"
cvs tag -m branchname_merge_number

First I move my changes off the branch, then review the changes with cvs diff, and then do the actual merge.

Always tag the branch after a merge! That makes multiple merges much easier.

Technology:

Bookmark/Search this post with