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

Re: Challenges for an octopus merge

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 10, 2011, 16:09 UTC
Message-ID
<7v8vxn6fdv.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4D53F694.1060105@web.de>
Markus Elfring <Markus.Elfring@web.de> writes:
Show 7 quoted lines
> ...
> Automated merge did not work.
> Should not be doing an Octopus.
> Merge with strategy octopus failed.
>
>
> The merge description was missing (no commit message) in this case.
The second-to-last line of the output needs to be rephrased.

Octopus is not for recording conflicting merges and when it punts you shouldn't be attempting to resolve and record it as an octopus merge.

Previous: Markus ElfringNext: Markus Elfring
Message 2 of 7 in “Challenges for an octopus merge”
  1. Markus ElfringFeb 10, 2011
  2. Junio C HamanoFeb 10, 2011
  3. Markus ElfringFeb 11, 2011
  4. Junio C HamanoFeb 11, 2011
  5. Markus ElfringFeb 12, 2011
  6. Markus ElfringFeb 15, 2011
  7. Markus ElfringApr 8, 2011

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.