Larry Hastings added the comment: 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! ---------- _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue21192> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: https://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
