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

Getting "Automatic merge failed" although all conflicts were resolved using previous resolution

From
Sebastian Schuberth <sschuberth@gmail.com>
Date
Apr 14, 2013, 12:39 UTC
Message-ID
<kke822$3ln$1@ger.gmane.org>
Hi,
I just realized Git merge still outputs
    Automatic merge failed; fix conflicts and then commit the result.
although all of my conflicts were resolved using a previously recorded resolution. I think it's OK for Git to not just do the merge commit in that case to sort of force a review of the resolution, but still I think the message is misleading. It should probably rather say something like
    All conflicts resolved using previous resolutions; please review and then commit the result.
Opinions?
-- 
Sebastian Schuberth
Message 1 of 1 in “Getting "Automatic merge failed" although all conflicts were resolved using previous resolution”
  1. Sebastian SchuberthApr 14, 2013

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.