From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 23 Feb 2016 12:36:36 GMT
Subject: Re: whither merge-tree?
Message-ID: <alpine.DEB.2.20.1602231334050.3152@virtualbox>
In-Reply-To: <20160223050210.GA17767@sigill.intra.peff.net>

Hi Peff,

On Tue, 23 Feb 2016, Jeff King wrote:

> On Mon, Feb 22, 2016 at 02:45:45PM -0800, Junio C Hamano wrote:
> 
> > Jeff King <peff@peff.net> writes:
> > 
> > >   3. Drop merge-tree completely. This deletes even more code, and
> > >   helps the people in (2) realize that it is utterly unmaintained.
> > >   :)
> >
> > Let's wait and see how many "please don't"s we hear, perhaps, before
> > deciding to go 3.?
> 
> I'm guessing we won't see much either way.

We could encourage more voices by issuing a warning when merge-tree is
called, e.g.:

	warning: merge-tree is unsupported (please contact
		 git@vger.kernel.org if you use it actively)

Ciao,
Dscho