From: Johannes Schindelin Date: Tue, 02 Jan 2007 21:17:43 GMT Subject: Re: [PATCH] xdl_merge(): fix a segmentation fault when refining conflicts Message-ID: In-Reply-To: <7vk605t9qz.fsf@assigned-by-dhcp.cox.net> Hi, On Tue, 2 Jan 2007, Junio C Hamano wrote: > Johannes Schindelin 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