[issue40551] PRs should be rebased on top of master before running the build/tests

[Inada Naoki]

Inada Naoki <songofacandy at gmail.com> added the comment:

On Sat, May 9, 2020 at 6:08 PM Filipe Laíns <report at bugs.python.org> wrote:
>
> > * Travis-CI, at least, does test against "merge commit", not HEAD of PR branch.
>
> Where? https://github.com/python/cpython/blob/master/.travis.yml

https://docs.travis-ci.com/user/pull-requests/

"Rather than build the commits that have been pushed to the branch the
pull request is from, we build the merge between the source branch and
the upstream branch."

> * Automatically
> * Semi-automatically

Both are fine, but...

>
> Please note in both situations, automatically rebasing PRs *is* the first step. After that, it's just figuring out a suitable model to re-trigger the checks before merging.

Bot shouldn't use rebase, but merge master branch.
Rebase in pull request branch break the pull request sometime.
See this thread:
https://discuss.python.org/t/info-rebase-origin-master-push-f-workflow-corrupts-pull-request-rarely/2558/7

----------

_______________________________________
Python tracker <report at bugs.python.org>
<https://bugs.python.org/issue40551>
_______________________________________