git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: still getting 'It is a submodule!" in 1.6.2.5

From
Tim Olsen <tim@brooklynpenguin.com>
Date
May 5, 2009, 14:23 UTC
Message-ID
<4A004BCA.5070709@brooklynpenguin.com>
In-Reply-To
<7vy6tc2gnt.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
Show 8 quoted lines
> But that is not the one you want.  7dae8b2 (diff -c -p: do not die on
> submodules, 2009-04-29) is to allow viewing of such a merge correctly; To
> make the merge automatically, you'd need 0c44c94 (merge-recursive: do not
> die on a conflicting submodule, 2009-04-29), which is on 'master', but not
> on 1.6.2.X (and likely will never be).
> 
> Could you be running 1.6.3-rcX instead of 1.6.2.X?  In general, the tip of
> the 'master' is always as stable as any released version, if not more.

Thanks Junio for your reply. We have made a copy of the offending branch by hand and have managed to merge that instead for now. I can wait until 1.6.3 is released.

Thanks again for your help!
Tim
Previous: Junio C HamanoNext: Tim Olsen
Message 3 of 6 in “still getting 'It is a submodule!" in 1.6.2.5”
  1. Tim OlsenMay 4, 2009
  2. Junio C HamanoMay 5, 2009
  3. Tim OlsenMay 5, 2009
  4. Tim OlsenMay 5, 2009
  5. Matthias AndreeMay 6, 2009
  6. Matthias AndreeMay 6, 2009

Read the whole thread, see it on lore, or plain text.

$ 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.