Mike Shamberger wrote:
> I had this problem last month. Make sure you use the -d option when you run
> the update command for the merge:
In general, most people don't seem to regret the following entries in ~/.cvsrc:
co -P
diff -uN
release -d
rdiff -u
up -Pd
Derek
--
Derek Price CVS Solutions Architect ( http://CVSHome.org )
mailto:[EMAIL PROTECTED] OpenAvenue ( http://OpenAvenue.com )
--
Every man's reason [is] his own rightful umpire. This principle, with that of
acquiescence in the will of the majority, will preserve us free and prosperous
as long as they are sacredly observed.
- Thomas Jefferson to John F. Watson, 1814
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
