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

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

hoi :)

On Mon, May 21, 2007 at 12:24:10AM +0200, Alex Riesen wrote:

quoted

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.