I'm having trouble with merging again. I am trying to merge changes from a branch into the trunk. Since there are a million changes, I don't want to deal with manually resolving conflicts. I just want to replace everything that's in my working copy of the trunk with what's in the branch, and then I'll commit to bring the trunk up to date with the branch.
The problem is that I'm getting conflicts -- the overwrite doesn't seem to be happening. I am running this command (from within my working copy of the trunk): cvs update -C -j <branch_name> For some reason, the "-C" option doesn't seem to have any effect, or else I'm doing this wrong. It's odd because no conflicts are reported by CVS output, yet, there the conflicts are, in the files. Anyone know what I'm doing wrong? Thanks, Erik --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
