From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 22 Jul 2021 10:25:01 GMT
Subject: RE: Bug: Commit a merge resolution with non-closed conflict markers leads to errs, segfault
Message-ID: <60f9477d9cd3a_3fba2082@natae.notmuch>
In-Reply-To: <bdb6c03f290c49bb96e6c0a3d9742a52@md6.fr>

BENTZ Sylvain wrote:
> I've stumbled on a segmentation fault while resolving merge conflicts.
> Basically, I missed to remove some conflict markers, tried to commit the
> (faulty) merge resolution, and Git mishandles that.
> 
> The original issue happened applying a patch using 3-way merge.  The minimal
> working example below creates a conflict with a simple `git merge` command.

A quick workaround:

  git config --global rerere.enabled false

But yeah, there seems to be a bug in `git rerere`.

-- 
Felipe Contreras