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

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.

-- 
Martin Waitz