From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Mar 2014 21:58:41 GMT
Subject: Re: [PATCH 2/3] merge: Advise user to use "git merge --abort" to abort merges
Message-ID: <xmqqr460bi7i.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1394771872-25940-3-git-send-email-andrew.kw.w@gmail.com>

Andrew Wong <andrew.kw.w@gmail.com> 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