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

Re: Challenges for an octopus merge

From
MEMarkus Elfring <markus.elfring@web.de>
Date
Feb 11, 2011, 16:23 UTC
Message-ID
<4D55627F.30305@web.de>
In-Reply-To
<7v8vxn6fdv.fsf@alter.siamese.dyndns.org>
> The second-to-last line of the output needs to be rephrased.
Which wording adjustment have you got in mind?
> 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.

Would it make sense to specify that the merging process may switch to the strategy "resolve" on demand?

Regards, Markus

Previous: Junio C HamanoNext: Junio C Hamano
Message 3 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.