RE: Bug: Commit a merge resolution with non-closed conflict markers leads to errs, segfault
To
BENTZ Sylvain
git@vger.kernel.org
From
Felipe Contreras
See Also
Prev
Date
2021-07-22 10:25:01 UTC
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