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

Re: git submodule merge madness

From
Ask Bjørn Hansen <ask@develooper.com>
Date
Jan 10, 2009, 01:13 UTC
Message-ID
<F01C5A5A-1FA3-42EC-BEE7-46A6C0E7C5DF@develooper.com>
In-Reply-To
<ADC7A3B1-6756-4258-93CD-DB40C7D2793C@develooper.com>
On Jan 9, 2009, at 1:50 PM, Ask Bjørn Hansen wrote:
Show 8 quoted lines
> 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
Replying to myself for the archives:

Looking in the code I noticed it's the recursive merge algorithm giving that error. Making it use the resolve strategy ("git merge -s resolve") made it work in the cases I had today, yay.

  - ask
-- 
http://develooper.com/ - http://askask.com/
Previous: Ask Bjørn HansenNext: Andreas Ericsson
Message 2 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.