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

Re: [PATCH v3 2/2] merge: remember conflict labels

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 12, 2026, 15:09 UTC
Message-ID
<xmqqld839cr2.fsf@gitster.g>
In-Reply-To
<9ac1a744-b326-4b61-869a-546fee80da20@gmail.com>
Phillip Wood <phillip.wood123@gmail.com> writes:
Show 21 quoted lines
> Hi Junio
>
> On 10/10/2026 01:24, Junio C Hamano wrote:
>> 
>> This function is called once for each conflicted path, which means
>> we would read the "merge.renormalize" configuration variable and the
>> MERGE_LABELS file, both of which will stay constant during a single
>> conflicted "checkout -m".  The issue is shared with the original,
>> but looking up the same configuration variable repeatedly would be
>> helped with in-core configset cache.  Compared to that, the overhead
>> added by this patch is to open the same unchanging file, read & parse,
>> allocate and deallocate.
>> 
>> Perhaps we want to have another preliminary [PATCH 1.5/2] before
>> this step to allow setting these "per invocation constants" once to
>> be reused?  Then step [PATCH 2/2] can read labels in the prepare
>> phace just once, use it from the data structure in
>> checkout_merged(), and free them in release phase when we are done.
>
> That's a good idea, I'll re-roll using the diff below (I assume you're 
> happy for me to add your sign off?)

You assumed correctly, but if you ask me, I would say that it probably does not count much as coauthorship than a mere helped-by.

Previous: Phillip WoodNext: Phillip Wood
Message 28 of 35 in “checkout -m: recreate conflict labels”
  1. 0/2 checkout -m: recreate conflict labelsPhillip Wood, Sep 30, 2026
  2. 1/2 remove_branch_state: convert boolean argument to flagsPhillip Wood, Sep 30, 2026
  3. 2/2 merge: remember conflict labelsPhillip Wood, Sep 30, 2026
  4. Junio C HamanoSep 30, 2026
  5. Phillip WoodOct 1, 2026
  6. Junio C HamanoOct 1, 2026
  7. Johannes SixtSep 30, 2026
  8. Junio C HamanoSep 30, 2026
  9. Johannes SixtSep 30, 2026
  10. Phillip WoodOct 1, 2026
  11. 0/2 checkout -m: recreate conflict labelsPhillip Wood, Oct 5, 2026
  12. 1/2 remove_branch_state: convert boolean argument to flagsPhillip Wood, Oct 5, 2026
  13. 2/2 merge: remember conflict labelsPhillip Wood, Oct 5, 2026
  14. Junio C HamanoOct 5, 2026
  15. Phillip WoodOct 6, 2026
  16. Junio C HamanoOct 5, 2026
  17. Phillip WoodOct 6, 2026
  18. Junio C HamanoOct 6, 2026
  19. Phillip WoodOct 7, 2026
  20. Johannes SixtOct 5, 2026
  21. Phillip WoodOct 5, 2026
  22. Junio C HamanoOct 5, 2026
  23. 0/2 checkout -m: recreate conflict labelsPhillip Wood, Oct 9, 2026
  24. 1/2 remove_branch_state: convert boolean argument to flagsPhillip Wood, Oct 9, 2026
  25. 2/2 merge: remember conflict labelsPhillip Wood, Oct 9, 2026
  26. Junio C HamanoOct 10, 2026
  27. Phillip WoodOct 12, 2026
  28. Junio C HamanoOct 12, 2026
  29. Phillip WoodOct 13, 2026
  30. Junio C HamanoOct 9, 2026
  31. 0/3 checkout -m: recreate conflict labelsPhillip Wood, Oct 13, 2026
  32. 1/3 remove_branch_state: convert boolean argument to flagsPhillip Wood, Oct 13, 2026
  33. 2/3 checkout -m <path>: cache merge settingsPhillip Wood, Oct 13, 2026
  34. 3/3 merge: remember conflict labelsPhillip Wood, Oct 13, 2026
  35. Junio C HamanoOct 13, 2026

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.