From: Linus Torvalds <torvalds@osdl.org>
Date: Thu, 09 Jun 2005 01:08:44 GMT
Subject: Re: Handling merge conflicts a bit more gracefully..
Message-ID: <Pine.LNX.4.58.0506081757170.2286@ppc970.osdl.org>
In-Reply-To: <7voeag1j9y.fsf@assigned-by-dhcp.cox.net>



On Wed, 8 Jun 2005, Junio C Hamano wrote:
> 
> Consider the following two command sequences:
> 
>      (1) git-read-tree -m $H $M	&& git-write-tree
> 
>      (2) I=`git-write-tree` &&
>          git-read-tree -m $H $I $M &&
>          git-merge-cache -o git-merge-one-file-script -a &&
>          git-write-tree
> 
> I think they should be equivalent in that:
> 
>    - when (1) refuses to run, (2) should either cause
>      git-read-tree to refuse, or at least should result in an
>      unmerged cache and git-write-tree phase should fail;
> 
>    - when (1) succeeds, (2) should also succeed, and the
>      resulting tree from both should be the same.

I think that sounds reasonable. Is it not the case now?

		Linus