Re: [PATCH] submodule merge support

hoi :)

On Mon, May 07, 2007 at 12:07:45AM +0200, Alex Riesen wrote:

Martin Waitz, Sun, May 06, 2007 21:02:24 +0200:

quoted

When merge-recursive gets to a dirlink, it starts an automatic
submodule merge and then uses the resulting merge commit for the
top-level tree.

merge-recursive is a mess already, you just made even more so.
Besides, you completely forgot all other merge strategies.

How about making all existing strategies just ignore submodules, and
move recursive merge in the merge driver (git-merge.sh)?

Well, I don't think it can be done in the merge driver but it does make
sense to consolidate all the low-level file-based merging (and the new
submodule merge is exactly that) between merge strategies.

-- 
Martin Waitz