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

Re: How to exchange rerere/redo resolutions?

From
Philip Oakley <philipoakley@iee.org>
Date
May 13, 2019, 22:24 UTC
Message-ID
<d139d79a-f35a-e00c-3790-104146b066c7@iee.org>
In-Reply-To
<37ccaad0-40b4-ca63-e057-791119d7fa69@talktalk.net>
Hi All,
On 10/05/2019 15:59, Philip Oakley wrote:
>> 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...

Does the contrib/rerere-train.sh actually work? I'm reading the code to ensure I understand what rerere/redo is doing, and in the training it tries to detect MERGE_RR via L87

     if test -s "$GIT_DIR/MERGE_RR"

It's not clear if that is an internal implementation detail, or a mistaken use of a historic path name. Can anyone enlighten me?

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

When copying patches across to Git for Windows, the conflict resolution can be tricky. -- Philip

Previous: Philip OakleyNext: Junio C Hamano
Message 4 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.