[Pandas-dev] Proposal to change PR update policy from rebase to merge

[Tom Augspurger]

Yes, recommending merging instead of rebasing seems OK now that Github has
squash on merge.

Tom

On Mon, Nov 13, 2017 at 3:58 PM, Stephan Hoyer <shoyer at gmail.com> wrote:

> +1 for merging instead of rebasing. Not losing comment history in PRs is a
> major bonus, and the end result (when we squash on merge) is basically
> looks the same.
>
> In fact, I would say with this workflow GitHub almost works as well as
> Gerrit ;).
>
> On Mon, Nov 13, 2017 at 1:54 PM Joris Van den Bossche <
> jorisvandenbossche at gmail.com> wrote:
>
>> Hi all,
>>
>> Currently when PRs get outdated, we often ask to "rebase and update"
>> (although to be honest, it mainly Jeff that is doing most of this work to
>> ping stale PRs), and rebasing is also how it is explained in the docs (
>> http://pandas-docs.github.io/pandas-docs-travis/
>> contributing.html#creating-a-branch).
>> And also many active contributors use rebasing while working on a PR to
>> get in sync with changes in master.
>>
>> I would like to propose to change this policy from rebasing to merging (=
>> merging master in the feature branch, creating a merge commit).
>>
>> Some reasons for this:
>>
>> - I personally think this is easier to do (certainly for less experienced
>> git users; conflicts can be easier to solve, ..)
>> - It makes it easier to follow what has changed (certainly if we extend
>> 'not rebasing' with 'not squash rebasing'), making it easier review
>> - It doesn't destroy links to github PR comments
>> - Since we squash on merge in the end, we don't care about the additional
>> merge commits in the PR's history
>>
>> Thoughts on this?
>>
>> If we would agree on this, that would mean: update the docs + start doing
>> it ourselves + start asking that of contributors consistently.
>>
>> Regards,
>> Joris
>>
>>
>>
>>
>> _______________________________________________
>> Pandas-dev mailing list
>> Pandas-dev at python.org
>> https://mail.python.org/mailman/listinfo/pandas-dev
>>
>
> _______________________________________________
> Pandas-dev mailing list
> Pandas-dev at python.org
> https://mail.python.org/mailman/listinfo/pandas-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/pandas-dev/attachments/20171113/c3c5d3eb/attachment.html>