Merge conflict - please help.

[Dewan, Mohit]

Hi,

Am trying to merge code from different releases on a vendor branch with
the main trunk.  Its giving conflicts on some files yet some files merge
just fine.  Please see attachment for my scenario.

The main trunk is on the left and version 1.1.1 and up are vendor
versions.  Am attempting to merge code from version 1.1.1.1 to 1.1.1.3
with revision 1.2 (on trunk) to make revision 1.3.  

Version 1.1.1.1 has the tag v13_01
Version 1.1.1.3 has the tag v19_05
Module name: md

The command I am using (from my working directory) is:
cvs checkout -kk -j v13_01 -j v19_05 md

I get a conflict while doing the above.  Once again, the conflict comes
up with some files but others (within the same directory) merge just
fine.  

Any ideas/hints will be appreciated.



Mohit Dewan

cvs.GIF
Description: cvs.GIF