On Mon, 7 May 2007, Martin Waitz wrote: > > 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? I dunno. It may well be that your approach of doing it inside the recursive merge is actually perfectly fine, and the only thing you need to look out for is that "inner" recursive case, and make sure that in that case, you don't do the merge at all, you just pick the "base" version automatically. I don't think we pass in that "inner" flag (I guess it's the "index_only" one) to the merge_file() routine. Linus - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html