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

From: Sebastian Schuberth <hidden>
Date: 2016-06-15 22:56:49

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help