Converting a branch into the main trunk

[Deever, Chris C.]

When merging a development branch into the HEAD trunk, is it possible to
somehow insure that code development branch always overwrites the main trunk
completely?

Since CVS does a line by line diff comparison to determine what code to
merge, I'm a bit hesitant to do the merge since the two versions of code are
very different at this point.  I'd like to know that the code in the
development branch will always take precedence over code in the HEAD trunk.

Maybe there is a way to simply rename the branches?

Thanks,

Chris