Copy branch to the trunk

[Richard Boehme]

Is there a way to copy a CVS branch to the trunk? I have a copy of the 
existing trunk, and I want to replace it with the 'dev' branch. When I 
try merging into my local copy using

cvs update -d -P -kk -j dev > ../cvsUpdateSynch.txt

from the trunk, I get piles and piles of conflicts. The trunk code han't 
been changed since the dev branch was started; I just want the trunk 
replaced with a copy of the 'dev' branch.

Is there a simpler way to do this than going through tons of files and 
resolving conflicts?

Thanks.

Richard