>>>> "APA" == Adrian Aichner
<adrian(a)xemacs.org> writes:
APA> I am getting these conflicts:
APA> cvs server: Updating doc/html/jde-ug/images
APA> cvs update: move away doc/html/jde-ug/images/Keybindings.gif; it is in the
way
Shit happens---for some reason CVS doesn't believe those files are
from CVS. Take a look at their entries in CVS/Entries. It's possible
that you somehow got a broken update and Entries did not get updated,
or disk full and it got truncated, or some such.
These are binary files, so I can't imagine you've edited them, except
by accident. It is safe to delete (or move) the ones you've got and
reupdate.
--
Institute of Policy and Planning Sciences
http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Don't ask how you can "do" free software business;
ask what your business can "do for" free software.