On Tue, Feb 22, 2000 at 10:42:44AM -0500, Donald Sharp wrote:
> On Tue, Feb 22, 2000 at 07:50:24PM +0530, Sankaranarayanan K V wrote:
> > Hi,
> >
> > I am using CVS 1.10.7 on Solaris 2.5.1.
> >
> > I am trying to make the HEAD of a branch B1 the same as that of another
> > branch B2 by:
> >
> > cd <B1 sand box>
> > cvs update -j B1 -j B2
> >
> > This should NOT give me any conflicts.
>
> Why shouldn't it give you conflicts? It's entirely reasonable that
> you have made( or someone within your company/whatever ) conflicting
> changes within the two branches...
>
I am not expecting conflicts because of the following:
- I make sure that the B1 sand box is up-to-date
- I make sure that during my merge no one commits to B1 and B2
And note that I am not on a trunk or a B3 sand box and doing
"-j B1 -j B2". I am on B1 and doing the merge so that I make the HEAD of
B1 the same as that of B2 (of course after a commit done after the
merge).
Regards
Sankar
