All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: BENTZ Sylvain <sylvain.bentz@md6.fr>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
	"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Bug: Commit a merge resolution with non-closed conflict markers leads to errs, segfault
Date: Thu, 22 Jul 2021 16:17:28 +0200	[thread overview]
Message-ID: <87pmvatoti.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <66af2662ae884fff81f51a4eb5ac1dd1@md6.fr>


On Thu, Jul 22 2021, BENTZ Sylvain wrote:

> 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.

      reply	other threads:[~2021-07-22 14:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-22  9:28 Bug: Commit a merge resolution with non-closed conflict markers leads to errs, segfault BENTZ Sylvain
2021-07-22 10:25 ` Felipe Contreras
2021-07-22 12:53   ` BENTZ Sylvain
2021-07-22 14:17     ` Ævar Arnfjörð Bjarmason [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87pmvatoti.fsf@evledraar.gmail.com \
    --to=avarab@gmail.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=sylvain.bentz@md6.fr \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.