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.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html