{"thread":{"id":"45733","subject":"no MERGE_HEAD after octopus merge failure","startedAt":"2017-04-18T14:26:50Z","lastAt":"2017-04-19T02:29:07Z","messageCount":2,"participants":["Max Ivanov","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"317108","messageId":"CALQ-8C+9dzM0cNCrK-DGiu8fc=UsS11OZbwhXWh_CDGOeGnECA@mail.gmail.com","threadId":"45733","inReplyTo":null,"subject":"no MERGE_HEAD after octopus merge failure","fromName":"Max Ivanov","fromEmail":"ivanov.maxim@gmail.com","sentAt":"2017-04-18T14:26:22Z","receivedAt":"2017-04-18T14:26:50Z","isPatch":false,"sender":{"key":"ivanov.maxim@gmail.com","avatar":null},"body":"Hi All,\n\nI am using git 2.12.0 and it leaves no MERGE_HEAD once octopus merge\nfailed with conflicts. Is it intentional? Files have conflicts markers\nand once resolved `git commit` creates just a normal commit, which is\nvery inconvenient and confusing.\n\nThanks\n"},{"id":"317174","messageId":"xmqqlgqxceqb.fsf@gitster.mtv.corp.google.com","threadId":"45733","inReplyTo":"CALQ-8C+9dzM0cNCrK-DGiu8fc=UsS11OZbwhXWh_CDGOeGnECA@mail.gmail.com","subject":"Re: no MERGE_HEAD after octopus merge failure","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-04-19T02:29:00Z","receivedAt":"2017-04-19T02:29:07Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Max Ivanov <ivanov.maxim@gmail.com> writes:\n\n> I am using git 2.12.0 and it leaves no MERGE_HEAD once octopus merge\n> failed with conflicts. Is it intentional? Files have conflicts markers\n> and once resolved `git commit` creates just a normal commit, which is\n> very inconvenient and confusing.\n\nI suspect you got these lines in the error message, which you didn't\nread:\n\n    Automated merge did not work.\n    Should not be doing an octopus.\n\nOctopus is designed to be done only for simple conflict-less merges,\nbecause it makes later bisection inherently (read: not fault of the\ntool, but a natural consequence of the shape of the resulting\nhistory) less efficient.  It might have been better if we chose to\n(1) refuse octopus merge if the working tree before \"git merge\"\nstarts is not clean, and(2) automatically run \"git reset --hard\"\nwhen failing an octopus issuing the above error message.  But we\ndidn't, so you'd need to do \"git reset --hard\" and merge the tips\none by one, not making an octopus.\n\n\n"}]}