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 12, 2011, 04:50 UTC
Message-ID
<4D561188.4000109@web.de>
In-Reply-To
<7vd3my1leq.fsf@alter.siamese.dyndns.org>
> The user needs to decide what to do next; the user may choose to do "git merge A C ; git merge B" instead,
> but *after* inspecting the situation.

I have inspected my situation a bit more. I hope that the merging process can be improved so that it can cope with my update suggestions here.

Would anybody (besides me) like to look into the affected patches and source files if the tool "Git" can provide a better service?

Does it make sense to add these files to your test-suite?

Regards, Markus

Previous: Junio C HamanoNext: Markus Elfring
Message 5 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.