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

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jul 14, 2016, 14:03 UTC
Message-ID: <alpine.DEB.2.20.1607141414180.6426@virtualbox>
In-Reply-To: <xmqqpoqi35u3.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Tue, 12 Jul 2016, Junio C Hamano wrote:

Show 7 quoted lines

> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> 
> > This is the second iteration of the long-awaited re-roll of the attempt to
> > avoid spawning merge-recursive from the builtin am and use merge_recursive()
> > directly instead.
> 
> This is actually the third iteration.

It is.

> I am trying to tease dependencies apart and apply this on a more
> reasonable base than a commit that happened to be at 'pu' on one
> day, but this would probably take some time, and I may give up
> merging it anywhere for today's integration cycle.  We'll see.

The two topics that are in 'pu' and conflict with this series are 'jh/clean-smudge-annex' and 'bc/cocci'.

It also conflicted with 'va/i18n-even-more', but that one was merged to 'master'.

Now, I think it would be okay to wait for 'bc/cocci' to go to 'master' before integrating the 'am-3-merge-recursive-direct' branch, but I would want to avoid waiting for 'jh/clean-smudge-annex'.

Do you concur? If so, I will rebase onto 'master' as soon as 'bc/cocci' lands in there.

Ciao, Dscho