From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Sat, 02 Jul 2011 09:44:24 GMT
Subject: Re: [PATCH 01/13] advice: Introduce error_resolve_conflict
Message-ID: <BANLkTik2A7K84dbeL5XkaGv8nbske=EmCA@mail.gmail.com>
In-Reply-To: <20110621155555.GF15461@elie>

Hi,

Jonathan Nieder writes:
>  2. The change is from
>
>        fatal: 'commit' is not possible because you have unmerged files.
>        Please, fix them up in the work tree ...
>        ... etc, etc ...
>
>    to
>
>        error: 'commit' is not ...
>        error: Please, fix them up...
>        ... etc, etc ...
>        fatal: Exiting because of an unresolved conflict.

> Notice that after writing the above, a little detail jumps out:
> namely, the second "error:" line is giving advice, so it might make
> sense to make it say "hint:" instead.

How do I do this correctly?  Changing the "return error" statement to
"fprintf(stderr, "hint: Please fix them up ...")" doesn't feel right.

--- Ram