Re: Improved three-way blob merging code

From: Alex Riesen <fork0@t-online.de>
Date: Jun 29, 2006, 23:07 UTC
Message-ID: <20060629230722.GA7216@steel.home>
In-Reply-To: <Pine.LNX.4.64.0606291028010.12404@g5.osdl.org>

Linus Torvalds, Thu, Jun 29, 2006 19:45:20 +0200:

Show 14 quoted lines

> IOW, what I'd like git-merge-tree to do is to be able to at a minimum say:
> 
>  - will a merge succeed cleanly, and if not, show me where the problem 
>    spots are.
>  - what will the result of the merge look like.
> 
> because that's actually what a downstream developer wants to do. He'd just 
> do
> 
> 	git fetch linus
> 	git show-changes linus..my-branch
> 
> which would basically be the preparatory thing for sending me an email 
> saying "please merge 'my-branch', and you'll see this".

it's a "git show-merge linus..my-branch" :)

> Now, obviously, I think that there's a _lot_ of overlap between doing this 
> and actually doing the merge itself, so hopefully the things I do will at 
> least have some things in common and perhaps help you do the proper 
> recursive merger.

I certanly hope so: only the last pass of the recursive merge seem to really need the index. It's use in all the previuos recursions looks more like abuse.