RE: Unexpected conflicts in branche merges

[Cameron, Steve]

Sankaranarayanan K V wrote:

> 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.
> 
> But I do get conflicts in some cases -- I don't know why.
         [...]
        What kind of conflicts...?
        What do they look like?

        For some file with a conflict, what if you do

        cvs diff -c -r B1 -r B2 > patchfile
        patch problem_file < patchfile

        Does that work as you would expect?

        -- steve