Hi,
I do get the newest version of Embperl via cvs upd and every time I do
that I get conflicts:
RCS file: /home/cvspublic/embperl/embpcgi.bat,v
retrieving revision 1.8
retrieving revision 1.10
Merging differences between 1.8 and 1.10 into embpcgi.bat
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in embpcgi.bat
C embpcgi.bat
RCS file: /home/cvspublic/embperl/embpcgi.pl,v
retrieving revision 1.8
retrieving revision 1.10
Merging differences between 1.8 and 1.10 into embpcgi.pl
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in embpcgi.pl
C embpcgi.pl
Is there a special reason that these files are modified locally during
the configuration/make cycle so these conflicts are happening all the
time?
--
Jens-Uwe Mager
HELIOS Software GmbH
Steinriede 3
30827 Garbsen
Germany
Phone: +49 5131 709320
FAX: +49 5131 709325
Internet: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
