{"thread":{"id":"33506","subject":"Getting \"Automatic merge failed\" although all conflicts were resolved using previous resolution","startedAt":"2013-04-14T12:39:32Z","lastAt":"2013-04-14T12:39:32Z","messageCount":1,"participants":["Sebastian Schuberth"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"214170","messageId":"kke822$3ln$1@ger.gmane.org","threadId":"33506","inReplyTo":null,"subject":"Getting \"Automatic merge failed\" although all conflicts were resolved using previous resolution","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2013-04-14T12:39:32Z","receivedAt":"2013-04-14T12:39:32Z","isPatch":false,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"Hi,\n\nI just realized Git merge still outputs\n\n    Automatic merge failed; fix conflicts and then commit the result.\n\nalthough 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\n\n    All conflicts resolved using previous resolutions; please review and then commit the result.\n\nOpinions?\n\n-- \nSebastian Schuberth\n"}]}