Eric Wong <normalperson@xxxxxxxx> writes: > Junio C Hamano <junkio@xxxxxxx> wrote: > >> Anticipating failure from "git-commit" is the right thing to do, >> but this is a "Now what?" situation. What is the expected >> course of action to recover from this for the end user, and how >> can we phrase the error message to help that process? > > I would expect git-commit to show the correct error message (or the > pre-commit hook), die "$RESOLVEMSG" might be a better option, though. It would say 'resolve conflicts, mark them with update-index as necessary, and say git-commit' or somesuch. I am not sure you would want the user to make a commit like suggested -- instead you would want him to say 'git rebase --continue' wouldn't you? - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html