Re: Hopefully just me: Conflicts in shell.sourceforge.net:/home/groups/xemacs/xemacsweb
At 03:16 PM 7/31/00 +0200, Tor Arntsen wrote:
You can make a local copy of that directory and do a 'cvs
update'
to see what happens. If everything for some reason (it shouldn't) get
screwed up you can just rm -rf it and go back to square one.
A classic way to achieve this is to use two different versions of CVS under
windows, its possible then for line-ending differences to get treated as
conflicts.
andy
--------------------------------------------------------------
Dr Andy Piper
Principal Consultant, BEA Systems Ltd