>Date: Tue, 27 Jun 2000 12:27:13 -0500
>From: David Thornley <[EMAIL PROTECTED]>
>To: [EMAIL PROTECTED]
>CC: [EMAIL PROTECTED]
>Subject: Problem with merge
>X-Mailing-List: <[EMAIL PROTECTED]> archive/latest/18277
>
>I just had a weird problem crop up.
>
>We have a file. At rev 1.8 we split off a release branch, and merged
>all changes in (so that diffing on 1.8.2.1 vs. 1.9 and 1.8.2.2 vs.
>1.10 pick up only the keyword changes).
>
>One user made a large change to 1.8.2.2, and checked it in as
1.8.2.3.
>He then tried merging it to head branch, and was told there were
>three conflicts.
>
What command are you using? If you use:
cvs update -j branch-name file.c
You will get conflicts because it will re-merge all the previously
merged changes.
If you used:
cvs update -j 1.8.2.2 -j 1.8.2.3 file.c
then I am just as confused as you are.
--
Stephen Rasku E-mail: [EMAIL PROTECTED]
Senior Software Engineer Phone: (604) 872-6676
TGI Technologies Web: http://www.tgivan.com/
