Paul Glezen has updated his “Branching with Eclipse and CVS” article for Eclipse 3.3. The new article is a two-parter: part one presents a brief branch-and-merge scenario designed to quickly illustrate some branch-and-merge features, and part two shows how to rebase a subbranch with changes from the main branch before merging the subbranch back into the main branch.