Home Original page

[python-committers] Can't merge into 3.6 (default) branch

Guido van Rossum guido at python.org
Mon Sep 28 22:50:15 CEST 2015 
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 <brett at python.org> wrote:

>
>
> On Mon, 28 Sep 2015 at 13:17 Guido van Rossum <guido at 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.
>



-- 
--Guido van Rossum (python.org/~guido)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-committers/attachments/20150928/fad27336/attachment.html>
More information about the python-committers mailing list