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

[Victor Stinner]

2018-05-29 22:12 GMT+02:00 Miro Hrončok <mhroncok at redhat.com>:
> On 29.5.2018 22:01, Victor Stinner wrote:
>>
>> GitHub provides a [Update branch] button. It seems like the button
>> does a rebase, no?
>
>
> AFAIK it merges the traget branch to the PR branch. No rebase.

Oh right! And it's the good option :-) Rebase cause confusions in
reviews. Merge are fine for reviews.

Victor