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

Re: git submodule merge madness

From
Sverre Rabbelier <srabbelier@gmail.com>
Date
Jan 15, 2009, 00:32 UTC
Message-ID
<bd6139dc0901141632x6d3a0b6bl3abd489e155dc97d@mail.gmail.com>
In-Reply-To
<AE1922C4-0543-424B-A635-494445E17E45@develooper.com>
On Thu, Jan 15, 2009 at 00:49, Ask Bjørn Hansen <ask@develooper.com> wrote:
Show 9 quoted lines
> On Jan 14, 2009, at 2:55 PM, Johannes Schindelin wrote:
>> 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)?
>
> IIRC I tried 1.6.1 and master as of about a week ago.
>
> I don't see d5a84fb in my repository (and google doesn't find it referenced
> anywhere when I search for "directory/submodule conflicts".

I checked current master: $ git log --grep="fail gracefully with" returns nothing. Searching the archive I don't see any reference to "fail gracefully with" either. I don't see it on your gitweb [0] either. Did that commit magically dissapear?

[0] http://repo.or.cz/w/git/dscho.git
-- 
Cheers,

Sverre Rabbelier
Previous: Ask Bjørn HansenNext: Johannes Schindelin
Message 6 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.