Unexpected conflicts in branche merges

[Sankaranarayanan K V]

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.

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