[cvsnt] "Copying" a branch to trunk

[Luigi D. Sandon]

Is there any way to "copy" a branch to the trunk (HEAD)? I mean, to perform 
a merge without CVS generating conflicts?

My problem is this. Some months ago I started a branch to experiment with 
some improvements. The experiment was successful, and the branch code should 
become the trunk now - the old code will be abandoned - maybe just some 
maintenance fixes on its own branch. It is already all checked in and 
tagged.

Due to the changes I made, I know a merge will generate a lot of conflicts - 
I wish I could avoid to go through a lot of files and resolve them. Or 
should I simply make a merge, and then overwrite the files in my sandbox 
with the files from the branch and commit?

These days of low-activity would be the right time to perform such an 
operation... :)

LDS