Re: [python-committers] Travis requirement temporarily turned off

2017-03-06 Thread Brett Cannon
I have turned back on the requirement that Travis be passing for PRs since 3.6.1rc1 is out and we now already have one instance where a merge broke the build (https://github.com/python/cpython/pull/518; it's been fixed). We will revisit this topic when I email on Friday about the workflow. On Thu,

[python-committers] GitHub: allow Rebase and merge

2017-03-06 Thread Victor Stinner
Hi, Would it be possible to keep "Squash and merge" button by default on GitHub pull requests, but allow "Rebase and merge" to keep multiple commits when they are well written. Example of such PR: https://github.com/python/cpython/pull/489/commits Maybe the second commit lacks bpo-xxx, but it's n