Re: [RFC] Third round of support for cloning submodules

From: Alex Riesen <raa.lkml@gmail.com>
Date: May 20, 2007, 23:02 UTC
Message-ID: <20070520230248.GI25462@steel.home>
In-Reply-To: <20070520225521.GP5412@admingilde.org>

Martin Waitz, Mon, May 21, 2007 00:55:22 +0200:

Show 13 quoted lines

> hoi :)
> 
> On Mon, May 21, 2007 at 12:24:10AM +0200, Alex Riesen wrote:
> > But it is not a merge. It is a checkout. Being another operation it
> > may even be disallow merges of subprojects. Just plainly tell user
> > that this checkout is not possible because there are changes in
> > subprojects and in the pointer to this subproject in the upper level
> > superproject, and that the user should think about committing in
> > subproject first.
> 
> If the user did commit and then you do a supermodule checkout -m you
> will get a merge.
>

Only if the user continue to use the last branch (or the detached head) the subproject was on. He don't have to, he can even return to the commit which does not conflict, unless he have to complicate things.