Re: [PATCH] A more sensible error message why 'git rebase --continue' failed

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 20, 2007, 06:25 UTC
Message-ID: <7vzm0m90ye.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <11875724181583-git-send-email-evan@fallingsnow.net>

Evan Phoenix <evan@fallingsnow.net> writes:

> The current message is a bit cryptic, indicating that only
> changes which contained merge conflicts should be added to the
> index, but in fact, all outstanding changes must be.

That might be true, and we might want a better yet still concise wording for the suggestion.

Your wording, however, would lead a new user to run "git add" even before resolving the conflicts, and then make him complain "why doesn't git do that for me", and then again complain "gaah, I followed the suggestion and ended up committing garbage with funny <<< === >>> lines in it".

So in that sense, I do not necessarily see _your_ new wording an improvement.

Show 8 quoted lines

> @@ -135,8 +135,12 @@ do
>  	case "$1" in
>  	--continue)
>  		git diff-files --quiet || {
> -			echo "You must edit all merge conflicts and then"
> -			echo "mark them as resolved using git add"
> +                        echo "Unable to continue rebase:"
> +                        echo "  All modified files must be added to index first."

Also I see whitespace breackages here --- did you intend to replace tabs with spaces, and if so why?