Skip to contentSkip to conversation

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

DISCUSSION Sebastian Schuberth 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

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?

Signature · 1 line
Sebastian Schuberth