Re: [PATCH v3 00/16] Use merge_recursive() directly in the builtin am

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jul 19, 2016, 14:28 UTC
Message-ID: <alpine.DEB.2.20.1607191602520.3472@virtualbox>
In-Reply-To: <alpine.DEB.2.20.1607191427400.3472@virtualbox>

Hi Junio,

On Tue, 19 Jul 2016, Johannes Schindelin wrote:

Show 15 quoted lines

> On Mon, 18 Jul 2016, Junio C Hamano wrote:
> 
> > Junio C Hamano <gitster@pobox.com> writes:
> > 
> > You can assume that I'll merge bc/cocci and
> > js/am-call-theirs-theirs-in-fallback-3way to 'master' during that time,
> > so an appropriate base to use would be the result of
> > 
> >     git checkout master^0
> >     git merge bc/cocci
> >     git merge js/am-call-theirs-theirs-in-fallback-3way
> >     git merge cc/apply-am
> > 
> > if you want a semi-solid base to rebuild am-3-merge-recursive-direct
> > on.

I do not need cc/apply-am at all, it turns out, but my patch series has a minor conflict with 'jc/renormalize-merge-kill-safer-crlf'.

Since you indicated that you want to cook that branch a bit in 'next' first, I will rebase to master+bc/cocci+js/am-call-theirs-theirs and re-submit.

Ciao, Dscho