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

Re: [PATCH] git-apply: try threeway first when "--3way" is used

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 6, 2021, 23:13 UTC
Message-ID
<xmqqk0pf0zxo.fsf@gitster.g>
In-Reply-To
<xmqqblas2b52.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
> Will queue.  Thanks.

Just to avoid confusion, "Will queue" does not mean "No further updates are necessary from you".

It is a short-hand to say "Even though the version I just reviewed may still want to be improved, it is in good enough shape to be tested with other topics on the 'seen' branch, so I'll do so primarily to see if there are any funny interactions with them".

IOW, I expect the patch to be rerolled before it is ready to be merged to 'next' and below.

Thanks.
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 6 in “git-apply: try threeway first when "--3way" is used”
  1. git-apply: try threeway first when "--3way" is usedJerry Zhang, Apr 6, 2021
  2. Junio C HamanoApr 6, 2021
  3. Junio C HamanoApr 6, 2021
  4. Junio C HamanoApr 6, 2021
  5. git-apply: try threeway first when "--3way" is usedJerry Zhang, Apr 6, 2021
  6. Junio C HamanoApr 7, 2021

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.