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

no MERGE_HEAD after octopus merge failure

From
MIMax Ivanov <ivanov.maxim@gmail.com>
Date
Apr 18, 2017, 14:26 UTC
Message-ID
<CALQ-8C+9dzM0cNCrK-DGiu8fc=UsS11OZbwhXWh_CDGOeGnECA@mail.gmail.com>
Hi All,

I am using git 2.12.0 and it leaves no MERGE_HEAD once octopus merge failed with conflicts. Is it intentional? Files have conflicts markers and once resolved `git commit` creates just a normal commit, which is very inconvenient and confusing.

Thanks
Next: Junio C Hamano
Message 1 of 2 in “no MERGE_HEAD after octopus merge failure”
  1. Max IvanovApr 18, 2017
  2. Junio C HamanoApr 19, 2017

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.