[rfk-dev] cvs conflict

Peter A. Peterson II pedro@flynn.zork.net
Fri, 8 Dec 2000 02:20:34 -0600


I added about 17 new nki and fixed a few others (with bad links,
wording, etc), as well as worked on http://robotfindskitten.org/ (lukas
and I have some cool, cool ideas.).

Anyway, when i tried to cvs ci, I got a conflict for
doc/robotfindskitten.info, and it said to resolve it before trying to
commit. Not sure what to do. 

Nick, what's the protocol for that?

Also, the robotfindskitten.info page mentions the nethack and emacs keys
but doesn't mention q for quitting.