[Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch

[Victor Stinner]

GitHub provides a [Update branch] button. It seems like the button
does a rebase, no?

Victor

2018-05-29 18:24 GMT+02:00 Matthias Bussonnier <bussonniermatthias at gmail.com>:
> On Tue, 29 May 2018 at 08:43, Paul G <paul at ganssle.io> wrote:
>>
>> This doesn't seem like the best idea, since it would kick off dozens or
>> hundreds of builds for every commit to the master branch.
>
>
> Sorry if I was unclear, I was not suggesting to do that for PRs against
> master, but do that only for 2.7, 3.4 and 3.5 only. (or Branch having
> "Require branches to be up to date before merging ")
> For these there is likely only a couple of open PRs, and it won't kick more
> jobs than if the author had to rebase and push by themselves.
>
> If you still think it's too much or triggered too often, you can also just
> have a tag "Miss-islington please rebase", which is often easier to apply
> manually, than having to do that by yourself on the Command line.
>
> --
> M
>
> _______________________________________________
> Python-Dev mailing list
> Python-Dev at python.org
> https://mail.python.org/mailman/listinfo/python-dev
> Unsubscribe:
> https://mail.python.org/mailman/options/python-dev/vstinner%40redhat.com
>