Guido van Rossum guido at python.org
Mon Sep 28 22:16:38 CEST 2015

• Previous message (by thread): [python-committers] 3.6 release plans
• Next message (by thread): [python-committers] Can't merge into 3.6 (default) branch
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-committers/attachments/20150928/05251cb7/attachment.html>

---

• Previous message (by thread): [python-committers] 3.6 release plans
• Next message (by thread): [python-committers] Can't merge into 3.6 (default) branch
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

More information about the python-committers mailing list