From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 03 Nov 2020 01:03:27 GMT
Subject: Re: [PATCH v5 0/4] Beginning of new merge strategy: New API, empty implementation
Message-ID: <xmqqtuu7p7z4.fsf@gitster.c.googlers.com>
In-Reply-To: <pull.895.v5.git.git.1604360734.gitgitgadget@gmail.com>

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

> In this series, I show the new merge API I have developed in merge-ort, and
> show how it differs from that provided by merge-recursive. I do this in four
> steps, each corresponding to a patch.
>
> Changes since v4:
>
>  * Fix a bug where 'cherry-pick --continue' would report 'fatal:
>    cherry-pick: --strategy cannot be used with --continue' when pull.twohead
>    was set to ort (found by user of internal deployment at $DAYJOB)

Will replace.  Thanks.