threads / discuss / 33506

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

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

## tl;dr

One message between Apr 14, 2013 and Apr 14, 2013.

replies: 0people: 1as markdown or json

Sebastian Schuberth· Apr 14, 2013, 12:39 UTC · lore
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

← back to recent threads