From: Marc Branchaud <marcnarc@xiplink.com>
Date: Sat, 15 Mar 2014 19:23:43 GMT
Subject: Re: [PATCH 3/3] reset: Print a warning when user uses "git reset" during a merge
Message-ID: <5324A8BF.80308@xiplink.com>
In-Reply-To: <xmqqa9csh54f.fsf@gitster.dls.corp.google.com>

On 14-03-14 04:55 PM, Junio C Hamano wrote:
>
> So I am OK with "eventually error out by default", but not OK with
> "we know better than the user and will not allow it at all".

Can I interpret that as you being OK with my proposed "Cowardly 
refusing" approach?

		M.