Re: [PATCH v3 1/4] merge-ort: barebones API of new merge strategy with empty implementation

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Oct 27, 2020, 07:54 UTC
Message-ID: <CAPig+cQ2e4NF6GhRvCTgt1KpPG5Lw_ybPM5FeWtmc69rxvXFuQ@mail.gmail.com>
In-Reply-To: <CABPp-BEGG7GYH=1dWnC_vxQimB07xPAQHWYcL=yk3rcYOk5SkA@mail.gmail.com>

On Tue, Oct 27, 2020 at 12:57 AM Elijah Newren <newren@gmail.com> wrote:

Show 14 quoted lines

> On Mon, Oct 26, 2020 at 7:33 PM Eric Sunshine <sunshine@sunshineco.com> wrote:
> > You forgot:
> >
> >     git merge -s newren
> >
> > the "NEW Recursive ENgine" merge strategy. I won't bore you with some
> > other backronyms I came up with[1].
> >
> > [1] Such as "Extended LInear Jump AHead", "UNabashedly Smart High
> > INtelligence Eccentricity" and "UNsurprisingly SHallow and
> > INsignificant Exception". Oh wait, don't read this if you don't want
> > to be bored.
>
> Haha, those are great!  :-)  Maybe we should come up with one for TUFF?

This "stuff" writes itself: Transitive Unified Fundamental Finalizer

Actually, I quite like "Extended LInear Jump AHead"; it sounds like it could be a genuine algorithm. "NEW Recursive ENgine" is also reasonably good in that it's a drop-in replacement for the old "recursive" strategy, although a bit generic as a name and doesn't give an indication of the algorithm like "Extended LInear Jump AHead" does (even if that algorithm is fanciful).