Ramkumar Ramachandra wrote:
> Introduce error_resolve_conflict corresponding to
> die_resolve_conflict, and implement the latter function in terms of
> the former. The only trade-off is that die_resolve_conflict is a
> little noisier now.
The above doesn't tell me what I would want to know, namely:
1. The impact of this patch is to change an error message.
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.
3. The intended benefit is that new, future callers may want the "error"
without exiting.
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.
--
To unsubscribe from this list: 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