[cvsnt] conflicts while importing vendor branch?

Richard Wirth richard at wirthware.de
Fri Sep 2 11:49:00 BST 2005


can anybody please explain?

When I import the second version of a third party source, I get lots
of conflicts. How is that possible?

first import command:
cvs import -d project vendor rel_1

second import command
cvs import -d project vendor rel_2

91 conficts created by this import.



cvsnt version 2.5.02.2067 (linux server/windows client)

-- 
Best regards,
 Richard                          mailto:richard at wirthware.de




More information about the cvsnt mailing list