From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Aug 2010 03:39:27 GMT
Subject: Re: [PATCH 2/2] merge: let custom strategies intervene in trivial merges
Message-ID: <7vbp93dy4w.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100816011106.GB22573@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

> As v1.6.1-rc1~294^2 (2008-08-23) explains, custom merge strategies
> do not even kick in when the merge is truly trivial.  But they
> should, since otherwise a custom “--strategy=theirs” is not useful.

I think it is a double-edged sword that trivial merge kicks in for custom
strategies.  If your mind is focused narrowly on "ours" or "theirs",
indeed it may be inconvenient, but on the other hand other custom
strategies may not want to run heavy-weight operations if a trivial merge
is sufficient.

So in the longer term, I suspect that each custom strategy needs to be
able to tell the merge machinery if it wants ff and trivial.