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
Felipe Contreras <felipe.contreras@gmail.com>
Date
Jul 22, 2021, 10:25 UTC
Message-ID
<60f9477d9cd3a_3fba2082@natae.notmuch>
In-Reply-To
<bdb6c03f290c49bb96e6c0a3d9742a52@md6.fr>
BENTZ Sylvain wrote:
Show 6 quoted lines
> 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
Previous: BENTZ SylvainNext: BENTZ Sylvain
Message 2 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.