Author larry
Recipients Adnan.Umer, benjamin.peterson, larry, python-dev, rhettinger, terry.reedy
Date 2015-09-04.08:21:51
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1441354912.32.0.982032852633.issue21192@psf.upfronthosting.co.za>
In-reply-to
Content
There won't be conflicts with Serhiy's merge--just the opposite.  His pull request was merged first, so it's perfect that he did his forward merge first.  He's already resolved any conflicts with his merge, and so when you merge you'll only have to worry about your own changes.

Just merge the current head (07e04c3), it'll be fine, honest!
History
Date User Action Args
2015-09-04 08:21:52larrysetrecipients: + larry, rhettinger, terry.reedy, benjamin.peterson, python-dev, Adnan.Umer
2015-09-04 08:21:52larrysetmessageid: <1441354912.32.0.982032852633.issue21192@psf.upfronthosting.co.za>
2015-09-04 08:21:52larrylinkissue21192 messages
2015-09-04 08:21:51larrycreate