*** You can now transfer changes between branches, using the new
command vc-merge (C-x v m). It is implemented for RCS and CVS. When
you invoke it in a buffer under version-control, you can specify
either an entire branch or a pair of versions, and the changes on that
branch or between the two versions are merged into the working file.
If this results in any conflicts, they may be resolved interactively,
using ediff.