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

Re: ag/merge-strategies-in-c [was Re: What's cooking in git.git (Nov 2020, #04; Thu, 19)]

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 23, 2020, 19:15 UTC
Message-ID
<xmqqd003oper.fsf@gitster.c.googlers.com>
In-Reply-To
<8c92f1d0-3f17-d8b2-ca93-c70ee887f37d@gmail.com>
Alban Gruin <alban.gruin@gmail.com> writes:
> There is some behaviour changes and regressions in this iteration that I
> intend to fix.  Expect a reroll soon.
Thanks for a heads-up.
> I also noticed that I can show which branch has made a branch when there
> is a conflict with the "resolve" strategy, like "recursive" already
> does.  Should this change be part of this series, or should it be a
> separate patch?

Depends. If it is already a separate patch on your end, keeping it separate, and even holding it off until the other/larger parts of the series solidifies, would be a good idea, as I expect it would be fairly straight-forward change once you have the fundamentals ready.

Thanks.
Previous: Alban Gruin
Message 4 of 4 in “What's cooking in git.git (Nov 2020, #04; Thu, 19)”
  1. Junio C HamanoNov 21, 2020
  2. René ScharfeNov 22, 2020
  3. ag/merge-strategies-in-c [was Re: What's cooking in git.git (Nov 2020, #04; Thu, 19)]Alban Gruin, Nov 22, 2020
  4. Junio C HamanoNov 23, 2020

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.