[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: New directories when merging branches...

From: Derek R. Price
Subject: Re: New directories when merging branches...
Date: Fri, 20 Oct 2000 11:41:10 -0400

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 Price                      CVS Solutions Architect ( )
mailto:address@hidden     OpenAvenue ( )
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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]