You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@trafficserver.apache.org by James Peach <jp...@apache.org> on 2016/09/26 18:27:59 UTC
github rebase merging
Hi all,
Github just released a new "rebase merging" feature, which makes merging PRs as clean as doing the merge by hand. See https://github.com/blog/2243-rebase-and-merge-pull-requests.
I'd like to propose that we always "rebase merge" PRs. There may be occasions where we would not do this, but I expect they are rare.
Here are the merge button options that can be toggled:
* Allow merge commits
Add all commits from the head branch to the base branch with a merge commit.
* Allow squash merging
Combine all commits from the head branch into a single commit in the base branch.
* Allow rebase merging
Add all commits from the head branch onto the base branch individually.
Shall we also ask INFRA to disable any of these merge options?
J
Re: github rebase merging
Posted by Alan Carroll <so...@yahoo-inc.com.INVALID>.
I already merge pull requests by hand whenever possible already to avoid the "MERGE" button in github.
On Monday, September 26, 2016 1:29 PM, Phil Sorber <so...@apache.org> wrote:
+1
On Mon, Sep 26, 2016 at 12:28 PM James Peach <jp...@apache.org> wrote:
> Hi all,
>
> Github just released a new "rebase merging" feature, which makes merging
> PRs as clean as doing the merge by hand. See
> https://github.com/blog/2243-rebase-and-merge-pull-requests.
>
> I'd like to propose that we always "rebase merge" PRs. There may be
> occasions where we would not do this, but I expect they are rare.
>
> Here are the merge button options that can be toggled:
>
> * Allow merge commits
> Add all commits from the head branch to the base branch with a
> merge commit.
>
> * Allow squash merging
> Combine all commits from the head branch into a single commit in
> the base branch.
>
> * Allow rebase merging
> Add all commits from the head branch onto the base branch
> individually.
>
> Shall we also ask INFRA to disable any of these merge options?
>
> J
>
>
Re: github rebase merging
Posted by Phil Sorber <so...@apache.org>.
+1
On Mon, Sep 26, 2016 at 12:28 PM James Peach <jp...@apache.org> wrote:
> Hi all,
>
> Github just released a new "rebase merging" feature, which makes merging
> PRs as clean as doing the merge by hand. See
> https://github.com/blog/2243-rebase-and-merge-pull-requests.
>
> I'd like to propose that we always "rebase merge" PRs. There may be
> occasions where we would not do this, but I expect they are rare.
>
> Here are the merge button options that can be toggled:
>
> * Allow merge commits
> Add all commits from the head branch to the base branch with a
> merge commit.
>
> * Allow squash merging
> Combine all commits from the head branch into a single commit in
> the base branch.
>
> * Allow rebase merging
> Add all commits from the head branch onto the base branch
> individually.
>
> Shall we also ask INFRA to disable any of these merge options?
>
> J
>
>
Re: github rebase merging
Posted by James Peach <jp...@apache.org>.
> On Sep 26, 2016, at 4:40 PM, Chou, Peter <pb...@labs.att.com> wrote:
>
> Hi,
>
> Isn't there a benefit to 'squash and merge' since it can keep some work-in-progress commits from ending up in the main branch history? Just curious if there are other considerations since both squash-and-merge and rebase-and-merge seem pretty similar (both use fast-forward-merging so no merge commit).
Work in progress commits should be eliminated by the author before merging. Squashing in the Github UI doesn't help this kind of branch since you still end up with a confusing concatenation of commit messages. Of course, the committer could do a manual merge and clean it all up, but I'd recommend polishing the branch for presentation after addressing any review feedback.
J
>
> Thanks,
> Peter
>
> -----Original Message-----
> From: James Peach [mailto:jpeach@apache.org]
> Sent: Monday, September 26, 2016 2:37 PM
> To: dev@trafficserver.apache.org
> Subject: Re: github rebase merging
>
>
>> On Sep 26, 2016, at 12:24 PM, Leif Hedstrom <zw...@apache.org> wrote:
>>
>>>
>>> On Sep 26, 2016, at 12:34 PM, Bryan Call <bc...@apache.org> wrote:
>>>
>>> +1 - Glad to see they are doing this.
>>>
>>> -Bryan
>>>
>>>
>>>
>>>
>>>> On Sep 26, 2016, at 11:27 AM, James Peach <jp...@apache.org> wrote:
>>>>
>>>> Hi all,
>>>>
>>>> Github just released a new "rebase merging" feature, which makes merging PRs as clean as doing the merge by hand. See https://github.com/blog/2243-rebase-and-merge-pull-requests.
>>>>
>>>> I'd like to propose that we always "rebase merge" PRs. There may be occasions where we would not do this, but I expect they are rare.
>>>>
>>>> Here are the merge button options that can be toggled:
>>>>
>>>> * Allow merge commits
>>>> Add all commits from the head branch to the base branch with a merge commit.
>>>>
>>>> * Allow squash merging
>>>> Combine all commits from the head branch into a single commit in the base branch.
>>>>
>>>> * Allow rebase merging
>>>> Add all commits from the head branch onto the base branch individually.
>>
>>
>> +1 as well. It’s worth asking Infra if they can disable the other options, but I have no idea if they can.
>
> https://issues.apache.org/jira/browse/INFRA-12658
>
>
>
RE: github rebase merging
Posted by "Chou, Peter" <pb...@labs.att.com>.
Hi,
Isn't there a benefit to 'squash and merge' since it can keep some work-in-progress commits from ending up in the main branch history? Just curious if there are other considerations since both squash-and-merge and rebase-and-merge seem pretty similar (both use fast-forward-merging so no merge commit).
Thanks,
Peter
-----Original Message-----
From: James Peach [mailto:jpeach@apache.org]
Sent: Monday, September 26, 2016 2:37 PM
To: dev@trafficserver.apache.org
Subject: Re: github rebase merging
> On Sep 26, 2016, at 12:24 PM, Leif Hedstrom <zw...@apache.org> wrote:
>
>>
>> On Sep 26, 2016, at 12:34 PM, Bryan Call <bc...@apache.org> wrote:
>>
>> +1 - Glad to see they are doing this.
>>
>> -Bryan
>>
>>
>>
>>
>>> On Sep 26, 2016, at 11:27 AM, James Peach <jp...@apache.org> wrote:
>>>
>>> Hi all,
>>>
>>> Github just released a new "rebase merging" feature, which makes merging PRs as clean as doing the merge by hand. See https://github.com/blog/2243-rebase-and-merge-pull-requests.
>>>
>>> I'd like to propose that we always "rebase merge" PRs. There may be occasions where we would not do this, but I expect they are rare.
>>>
>>> Here are the merge button options that can be toggled:
>>>
>>> * Allow merge commits
>>> Add all commits from the head branch to the base branch with a merge commit.
>>>
>>> * Allow squash merging
>>> Combine all commits from the head branch into a single commit in the base branch.
>>>
>>> * Allow rebase merging
>>> Add all commits from the head branch onto the base branch individually.
>
>
> +1 as well. It’s worth asking Infra if they can disable the other options, but I have no idea if they can.
https://issues.apache.org/jira/browse/INFRA-12658
Re: github rebase merging
Posted by James Peach <jp...@apache.org>.
> On Sep 26, 2016, at 12:24 PM, Leif Hedstrom <zw...@apache.org> wrote:
>
>>
>> On Sep 26, 2016, at 12:34 PM, Bryan Call <bc...@apache.org> wrote:
>>
>> +1 - Glad to see they are doing this.
>>
>> -Bryan
>>
>>
>>
>>
>>> On Sep 26, 2016, at 11:27 AM, James Peach <jp...@apache.org> wrote:
>>>
>>> Hi all,
>>>
>>> Github just released a new "rebase merging" feature, which makes merging PRs as clean as doing the merge by hand. See https://github.com/blog/2243-rebase-and-merge-pull-requests.
>>>
>>> I'd like to propose that we always "rebase merge" PRs. There may be occasions where we would not do this, but I expect they are rare.
>>>
>>> Here are the merge button options that can be toggled:
>>>
>>> * Allow merge commits
>>> Add all commits from the head branch to the base branch with a merge commit.
>>>
>>> * Allow squash merging
>>> Combine all commits from the head branch into a single commit in the base branch.
>>>
>>> * Allow rebase merging
>>> Add all commits from the head branch onto the base branch individually.
>
>
> +1 as well. It’s worth asking Infra if they can disable the other options, but I have no idea if they can.
https://issues.apache.org/jira/browse/INFRA-12658
Re: github rebase merging
Posted by Leif Hedstrom <zw...@apache.org>.
> On Sep 26, 2016, at 12:34 PM, Bryan Call <bc...@apache.org> wrote:
>
> +1 - Glad to see they are doing this.
>
> -Bryan
>
>
>
>
>> On Sep 26, 2016, at 11:27 AM, James Peach <jp...@apache.org> wrote:
>>
>> Hi all,
>>
>> Github just released a new "rebase merging" feature, which makes merging PRs as clean as doing the merge by hand. See https://github.com/blog/2243-rebase-and-merge-pull-requests.
>>
>> I'd like to propose that we always "rebase merge" PRs. There may be occasions where we would not do this, but I expect they are rare.
>>
>> Here are the merge button options that can be toggled:
>>
>> * Allow merge commits
>> Add all commits from the head branch to the base branch with a merge commit.
>>
>> * Allow squash merging
>> Combine all commits from the head branch into a single commit in the base branch.
>>
>> * Allow rebase merging
>> Add all commits from the head branch onto the base branch individually.
+1 as well. It’s worth asking Infra if they can disable the other options, but I have no idea if they can.
— leif
Re: github rebase merging
Posted by Bryan Call <bc...@apache.org>.
+1 - Glad to see they are doing this.
-Bryan
> On Sep 26, 2016, at 11:27 AM, James Peach <jp...@apache.org> wrote:
>
> Hi all,
>
> Github just released a new "rebase merging" feature, which makes merging PRs as clean as doing the merge by hand. See https://github.com/blog/2243-rebase-and-merge-pull-requests.
>
> I'd like to propose that we always "rebase merge" PRs. There may be occasions where we would not do this, but I expect they are rare.
>
> Here are the merge button options that can be toggled:
>
> * Allow merge commits
> Add all commits from the head branch to the base branch with a merge commit.
>
> * Allow squash merging
> Combine all commits from the head branch into a single commit in the base branch.
>
> * Allow rebase merging
> Add all commits from the head branch onto the base branch individually.
>
> Shall we also ask INFRA to disable any of these merge options?
>
> J
>