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

Re: How to exchange rerere/redo resolutions?

From
POPhilip Oakley <philipoakley@talktalk.net>
Date
May 10, 2019, 14:59 UTC
Message-ID
<37ccaad0-40b4-ca63-e057-791119d7fa69@talktalk.net>
In-Reply-To
<871s17xk79.fsf@evledraar.gmail.com>
On 10/05/2019 00:49, Ævar Arnfjörð Bjarmason wrote:
Show 28 quoted lines
> On Fri, May 10 2019, Philip Oakley wrote:
>
>> Is there a mechanism for exchanging the rerere resolutions, so that
>> future fixups, e.g. future clashes on pu rather than master, can be
>> sent with patch series?
>>
>> My current use case that there is a large patch [1] for updating long
>> to size_t for use on Windows, which notes that it will have clashes
>> with pu, but doesn't appear to have any method  of sending a rerere
>> resolution (which the author is already aware of) to the list. Being
>> able to flag up such fixes should simplify such conflict resolutions.
>>
>> I had some very rough ideas about how the resolutions should look
>> rather similar to three-way conflict markers, with the resolution as
>> the 'base' (between the ||| - ||| marks), which would be resolved via
>> a --base merge strategy.
>>
>> However if there is already a method for exchanging resolutions, where
>> should I look?
>>
>> Philip
>>
>> [1] <20190413151850.29037-1-tboegi@web.de> [PATCH v3 1/1] Use size_t
>> instead of 'unsigned long' for data in memory
> You can publish your merged branch somewhere, and others can use
> contrib/rerere-train.sh to learn from the resolution.
>
> Supposedly, I've never actually used it...

The tricky part is when the patch series doesn't apply so the conflict isn't yet on any branch..

I'm looking to write up some suggestions as a potential project, so that we can all make better use of this capability (hence the `redo` synonym alias suggestion). Philip

Previous: Ævar Arnfjörð BjarmasonNext: Philip Oakley
Message 3 of 10 in “How to exchange rerere/redo resolutions?”
  1. Philip OakleyMay 9, 2019
  2. Ævar Arnfjörð BjarmasonMay 9, 2019
  3. Philip OakleyMay 10, 2019
  4. Philip OakleyMay 13, 2019
  5. Junio C HamanoMay 13, 2019
  6. Ævar Arnfjörð BjarmasonMay 14, 2019
  7. Philip OakleyMay 14, 2019
  8. Junio C HamanoMay 15, 2019
  9. Torsten BögershausenMay 10, 2019
  10. Philip OakleyMay 10, 2019

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.