Hi Junio, On Tue, 19 Jul 2016, Johannes Schindelin wrote:
> On Mon, 18 Jul 2016, Junio C Hamano wrote: > > > Junio C Hamano <gits...@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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
