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

Re: Bug: Commit a merge resolution with non-closed conflict markers leads to errs, segfault

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Jul 22, 2021, 14:17 UTC
Message-ID
<87pmvatoti.fsf@evledraar.gmail.com>
In-Reply-To
<66af2662ae884fff81f51a4eb5ac1dd1@md6.fr>
On Thu, Jul 22 2021, BENTZ Sylvain wrote:
Show 8 quoted lines
> Oh I wasn't aware of this when I initialized my MWE repo, from git-config[1]:
>
>   By default, git-rerere[1] is enabled if there is an rr-cache directory under
>   the $GIT_DIR, e.g. if "rerere" was previously used in the repository.
>
> The correct MWE requires to enable rerere:
>
>   git config rerere.enabled true

I think the patch I posted at the end of https://lore.kernel.org/git/87v96p4w3f.fsf@evledraar.gmail.com/ should might catch this, i.e. the "could not copy" error.

Previous: BENTZ Sylvain
Message 4 of 4 in “Bug: Commit a merge resolution with non-closed conflict markers leads to errs, segfault”
  1. BENTZ SylvainJul 22, 2021
  2. Felipe ContrerasJul 22, 2021
  3. BENTZ SylvainJul 22, 2021
  4. Ævar Arnfjörð BjarmasonJul 22, 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.