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

From: Martin Waitz <tali@admingilde.org>
Date: May 20, 2007, 22:55 UTC
Message-ID: <20070520225521.GP5412@admingilde.org>
In-Reply-To: <20070520222410.GF25462@steel.home>

hoi :)

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

Show 6 quoted lines

> 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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.