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

Re: git submodule merge madness

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 14, 2009, 22:55 UTC
Message-ID
<alpine.DEB.1.00.0901142354120.3586@pacific.mpi-cbg.de>
In-Reply-To
<ADC7A3B1-6756-4258-93CD-DB40C7D2793C@develooper.com>
Hi,
On Fri, 9 Jan 2009, Ask Bjørn Hansen wrote:
Show 10 quoted lines
> We've (again) replaced a few directories with submodules.  Man, it's 
> madness!
> 
> The typical problem is that we get an error trying to merge a "pre-submodule"
> branch into master:
> 
> 	fatal: cannot read object 894c77319a18c4d48119c2985a9275c9f5883584
> 'some/sub/dir': It is a submodule!
> Mark Levedahl wrote an example in July, but I don't think he got any replies:
> http://marc.info/?l=git&m=121587851313303

So.... Which Git version are you are using? Did you test any Git version containing the commit d5a84fb(merge-recursive: fail gracefully with directory/submodule conflicts)?

Ciao, Dscho

Previous: Andreas EricssonNext: Ask Bjørn Hansen
Message 4 of 7 in “git submodule merge madness”
  1. Ask Bjørn HansenJan 9, 2009
  2. Ask Bjørn HansenJan 10, 2009
  3. Andreas EricssonJan 12, 2009
  4. Johannes SchindelinJan 14, 2009
  5. Ask Bjørn HansenJan 14, 2009
  6. Sverre RabbelierJan 15, 2009
  7. Johannes SchindelinJan 15, 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.