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...
donald
>
> But I do get conflicts in some cases -- I don't know why.
>
> I tried to duplicate the problem so that I can send the exact sequence
> of commands and file contents; but I could not.
>
> What could be the reasons for the conflicts in this case?
>
> Regards
> Sankar
>
