On Mon, 28 Sep 2015 at 13:17 Guido van Rossum <gu...@python.org> wrote:
> I've made some changes to asyncio but I've run into a snag -- I can't > merge the changes from 3.5 into 3.6 (the default branch). It seems some > other changes to 3.5 haven't been merged and I don't want to just commit > the default merge outcome (which affected a huge number of files). > > I thought the merge policy was to relentlessly merge everything from 3.5 > into 3.6 (using null merges to mark decisions not to copy a specific diff)? > Yes, that is the merge policy, so someone messed up and didn't do the forward merge.
_______________________________________________ python-committers mailing list python-committers@python.org https://mail.python.org/mailman/listinfo/python-committers
