Re: [boost] Release procedures?

From: David Abrahams (david.abrahams_at_[hidden])
Date: 2002-01-24 17:57:49

----- Original Message -----
From: "Beman Dawes" <bdawes_at_[hidden]>

> That procedure does seem to work once.  But if you have to make a second
> change to the same file, the 2nd merge results in conflicts.  It tries to
> merge the original change back into the main trunk copy a second time.
>
> I tried several variations on the theme.  The problem always come the
> second time I tried do a merge.  Does a new branch have to be created
after
> each merge?

No, it's covered in CVSBook:

http://cvsbook.red-bean.com/cvsbook.html#Multiple_Merges