On Mon, 7 May 2007, Linus Torvalds wrote: > > 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 Oh, btw, you should also look out for the case where the superproject doesn't actually have the subprojects in question checked out. What happens then? Just leave them conflicted? 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