[Dxspider-support] cvs - unusual Spider update result
Eric Carling
eric at g0cgl.f2s.com
Thu Oct 7 15:12:50 BST 2004
I have just run CVS in Windows - I don't understand the warning and
conflict messages and would be grateful to receive advice as to what, if any
action I should take.
Thanks,
Eric GB7CGL-1
RCS file: /cvsroot/dxspider/spider/perl/AMsg.pm,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into AMsg.pm
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in perl/AMsg.pm
C perl/AMsg.pm
P perl/DXProt.pm
P perl/DXProtout.pm
RCS file: /cvsroot/dxspider/spider/perl/cluster.pl,v
retrieving revision 1.205
retrieving revision 1.206
Merging differences between 1.205 and 1.206 into cluster.pl
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in perl/cluster.pl
C perl/cluster.pl
P perl/importkeps.pl
U perl/importwwv.pl
P perl/process_ursa.pl
Success, CVS operation completed
Tortoise Tip: One or more of your files has a conflict. This means that
someone else has altered the same part of the file as you. Look above for
the files marked "C ", and manually edit them to resolve the conflict.
More information about the Dxspider-support
mailing list