[python-committers] Can't merge into 3.6 (default) branch
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)? -- --Guido van Rossum (python.org/~guido) ___ python-committers mailing list [email protected] https://mail.python.org/mailman/listinfo/python-committers
Re: [python-committers] Can't merge into 3.6 (default) branch
On Mon, 28 Sep 2015 at 13:17 Guido van Rossum 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 [email protected] https://mail.python.org/mailman/listinfo/python-committers
Re: [python-committers] Can't merge into 3.6 (default) branch
Well, somehow I managed to fix it by switching directories... Not sure what happened. :-( On Mon, Sep 28, 2015 at 1:23 PM, Brett Cannon wrote: > > > On Mon, 28 Sep 2015 at 13:17 Guido van Rossum 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. > -- --Guido van Rossum (python.org/~guido) ___ python-committers mailing list [email protected] https://mail.python.org/mailman/listinfo/python-committers
