Andrew Wong <andrew.kw.w@xxxxxxxxx> writes:
> Print message during "git merge" and "git status".
>
> Add a new "mergeHints" advice to silence these messages.
This sounds sensible. Don't we want to have this one take effect on
the places where advice.resolveConflict is used in git-pull?
I.e. something like:
do_we_advise=no
if advice.resolveConflict is not set:
if advice.mergeHints is set to false:
do_we_advise=no
else:
do_we_advise=yes
else:
do_we_advise=yes
if do_we_advise == 'yes':
give advice in die_conflict and die_merge
--
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