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 >

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