Easiest way to move a branch to the trunk

[Brian J. Murrell]

I have a project/repository which has a main branch (trunk) for
stable, released versions and a development branch.  The development
branch was branched off of the main branch a while ago for development
and has going along gangbusters.  Now it is time to release.  What is
the easiest way to move the develoment branch onto the main branch so
that what is on the main branch is completely replaced by the
development branch.

I realize of course I could use "cvs update -j" to move it all over
but that is going to create a boatload of conflicts.  I can deal with
conflicts easily (and tediously) enough but I wonder why I should need
to bother.  It seems that I should be able to simply replace the
contents of the main branch with the development branch in an easier
way, no?

All suggestions welcome, thanx.

b.

-- 
Brian J. Murrell