Re: [PATCH] xdl_merge(): fix a segmentation fault when refining conflicts

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jan 2, 2007, 21:17 UTC
Message-ID: <Pine.LNX.4.63.0701022216420.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7vk605t9qz.fsf@assigned-by-dhcp.cox.net>

Hi,

On Tue, 2 Jan 2007, Junio C Hamano wrote:

Show 11 quoted lines

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > That is certainly a possibility! But how would you specify it? If you 
> > do it as a command line option, you'd have to add it to git-merge, 
> > git-pull, git-merge-recursive and git-merge-file. Ugly.
> 
> Another thing to worry about is that this would make things
> "works most of the time but when it fails it fails silently"
> which would lead to very hard to detect problem in the project
> managed by git.  I'd be very hesitant about this for this reason
> alone.

Right. That was what I was alluding to with my comment "what if you prefer the deletion over the addition?"

It _seems_ clever at first sight, but it isn't.

Ciao, Dscho