From: Martin Waitz <tali@admingilde.org>
Date: Mon, 07 May 2007 19:33:14 GMT
Subject: Re: [PATCH] submodule merge support
Message-ID: <20070507193314.GL30511@admingilde.org>
In-Reply-To: <alpine.LFD.0.98.0705071015230.3802@woody.linux-foundation.org>

hoi :)

On Mon, May 07, 2007 at 10:17:11AM -0700, Linus Torvalds wrote:
> 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?

yes, I think that's the only sane thing one can do.

-- 
Martin Waitz