Re: [core-workflow] New Github Features

On Sat, 2 Apr 2016 15:07:21 +1000 Nick Coghlan wrote:

On 2 April 2016 at 06:59, Brett Cannon wrote:

...

So this support of squash merging may be useful. It really depends on how we try and support porting changes between versions and Misc/NEWS.

Having the bot handle squashing is likely still desirable, since the flow you really want is:

- squash & rebase the PR - run the test suite/build the docs (depending on modified files) - commit if successful

What happens if there's a PR based on another PR? When the latter is squash-merged, the former will likely end up with many conflicts since git won't be able to reconcile the histories anymore. Regards Antoine.