From: Linus Torvalds <torvalds@osdl.org>
Date: Sun, 01 May 2005 21:42:51 GMT
Subject: Re: [PATCH] Really fix git-merge-one-file-script this time.
Message-ID: <Pine.LNX.4.58.0505011441140.2296@ppc970.osdl.org>
In-Reply-To: <7vsm16sl0q.fsf@assigned-by-dhcp.cox.net>



On Sun, 1 May 2005, Junio C Hamano wrote:
> 
> Let me make sure I understand you correctly before I go
> further.  In the above sentence, do you mean a merge that is
> _successful_ by merges that:
> 
>     (1) "git-remove-tree -m" considers them trivial;
> 
> or
>     (2) in addition to (1), "git-merge-one-file-script"
>         considers them trivial.  That is, only one-side changes
>         or removes or adds it, or both sides adds it
>         identically, or merge/diff3 merges without conflict.

(2).

But in the more general case _any_ automated merge is the "uninteresting" 
case (except for the fact that we hope for them ;)

In other words, I want this case really designed for the situation where 
automation (_any_ kind) breaks down. 

			Linus