Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://mail.python.org/pipermail/python-dev/2018-May/153752.html below:

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

• Previous message (by thread): [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch
• Next message (by thread): [Python-Dev] When tp_clear returns non-zero?
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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

• Previous message (by thread): [Python-Dev] Troubles to merge changes in the 2.7 branch: PR "out-of-date" branch
• Next message (by thread): [Python-Dev] When tp_clear returns non-zero?
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4