I am getting Conflicts when updating from the command line or from a build script. cvs update -d cvs update: move away test/conf/testloader_tests.prp; it is in the way C test/conf/testloader_tests.prp Updates from within WinCVS work fine?