Re: [PATCH] submodule merge support

hoi :)

On Mon, May 07, 2007 at 09:02:00AM -0700, Linus Torvalds wrote:

But if you have multiple merge-bases and you do a recursive merge to 
create a new *combined* merge-base, trying to do that for the submodule is 
just pointless.

Ah, now I see your point.
And yes, you are right.

So not doing it in the low-level merger is right - because it is simply 
irrelevant at that stage. The low-level merger might as well ignore 
submodules.

But where to do it then?
Do a first run which simply ignores dirlinks and then do another run
which looks for all unmerged index entries and processes all dirlinks
by merging the submodule?

-- 
Martin Waitz