|
From: | Richard Boehme |
Subject: | Copy branch to the trunk |
Date: | Wed, 01 Feb 2006 09:44:37 -0500 |
User-agent: | Debian Thunderbird 1.0.2 (X11/20051002) |
cvs update -d -P -kk -j dev > ../cvsUpdateSynch.txtfrom 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
[Prev in Thread] | Current Thread | [Next in Thread] |