Re: [RFC 2/3] merge: Add hints to tell users about "git merge --abort"

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Mar 5, 2014, 18:35 UTC
Message-ID: <vpqbnxkebne.fsf@anie.imag.fr>
In-Reply-To: <CADgNjak3aqPDV0iZYc8b6QJ9y+6bUd28n0UJOm6WjufQhjfuwA@mail.gmail.com>

Andrew Wong <andrew.kw.w@gmail.com> writes:

Show 8 quoted lines

> On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
>> Andrew Wong wrote:
>>
>>> --- a/builtin/merge.c
>>> +++ b/builtin/merge.c
>>> @@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
>>> +                     "fix conflicts and then commit the result.\n"
>>> +                     "To abort the merge, use \"git merge --abort\".\n"));

[...]

Show 5 quoted lines

> This means contexts are no longer only about "resolving conflict", so
> I was thinking of renaming advice.resolveConflict to something like
> advice.mergeHints.
>
> Any thoughts?

If the advice suggests merge --abort, then why not advice.abortMerge ?

But mergeHints makes sense to me also, as it would potentially encompass more cases.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/