From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Thu, 04 Dec 2008 10:11:07 GMT
Subject: Re: more merge strategies : feature request
Message-ID: <20081204191107.6117@nanako3.lavabit.com>
In-Reply-To: <7vabbc7kk5.fsf@gitster.siamese.dyndns.org>

Quoting Junio C Hamano <gitster@pobox.com>:

> I thought http://article.gmane.org/gmane.comp.version-control.git/89033 in
> the thread (and your response to it which is 89175) pretty much concluded
> the discussion.  Is Caleb adding anything new to the discussion (iow, is
> there a convincing new argument why having such a merge is a good idea and
> what the workflow looks like that benefits from it)?

I first thought so, but after reading this feature request thread again I do not think so anymore.

Sorry for the noise.

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/