
cvs update -j branch_1_2_last_merged -j branch_1_2_head  

# resolve conflicts and commit to head
cvs commit  

# (Either now or before next changes)
# Before changes or after merges we must mark the branch to keep track of
#  what has been merged.  (Move the last merged tag to the head of the branch)
cvs tag -F -r branch_1_2_head branch_1_2_last_merged # tag branch while in head
# or goto branch and tag from there
#cvs update -r branch_1_2_head 
#cvs tag -F branch_1_2_last_merged  # -F moves tag if it is found

