On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder <jrnie...@gmail.com> wrote:
> Andrew Wong wrote:
>> --- a/builtin/merge.c
>> +++ b/builtin/merge.c
>> @@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
>> printf(_("Automatic merge failed; "
>> - "fix conflicts and then commit the result.\n"));
>> + "fix conflicts and then commit the result.\n"
>> + "To abort the merge, use \"git merge --abort\".\n"));
> Seems reasonable, but I worry about the command growing too noisy.
> Could this be guarded by an advice.<something> setting? (See advice.*
> in git-config(1) for what I mean.)
I was planning to use advice.resolveConflict, but as I went through
merge.c, I noticed there could be a few other situations where we
could print out the same message:
1. when prepare_to_commit() fails, due to hook error, editor error, or
empty commit message
2. "git commit --no-commit"
This means contexts are no longer only about "resolving conflict", so
I was thinking of renaming advice.resolveConflict to something like
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