httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Tom Tromey <>
Subject Re: cvs problem
Date Sun, 02 Jun 1996 17:05:49 GMT
"cvs update" merges your local changes with any changes committed
since you last did an update.  If your changes overlap with committed
changes, then you get a conflict and you must fix it by hand.

If you're just doing some testing, and want to update without
preserving your changes (or if you want to get rid of your changes in
an easy way), just remove the working file and do an update.

--                 Member, League for Programming Freedom

View raw message