[Top][All Lists]

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

Re: conflict on added files

From: Derek Robert Price
Subject: Re: conflict on added files
Date: Fri, 27 Jun 2003 09:57:31 -0400
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.2) Gecko/20030208 Netscape/7.02

Paul Edwards wrote:

Derek, I've just been going through some old stuff to see what
made it in so far, thanks for doing the "rdiff -s" with version
number for "removed".  But what is the status of this one?

You were concerned that it was easy to get around this conflict
by just doing a "touch", but I think it is better to have some
sort of safety net rather than none, even if ideally it would
reference /dev/null and do a 3-way merge to get conflict
markers in the code itself.

BFN.  Paul.

Try that again as a universal or context diff and I'll take a look.



Email: derek@ximbiot.com

Get CVS support at <http://ximbiot.com>!
I will not sell miracle cures.
I will not sell miracle cures.
I will not sell miracle cures...

         - Bart Simpson on chalkboard, _The Simpsons_

reply via email to

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