You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@calcite.apache.org by zhiqiang <zh...@apache.org> on 2017/06/23 09:22:37 UTC
How to merge pull request in github?
Hi all
How to merge pull requests in calcite github?
I saw all pull request was closed. but not merged in github.
All commits can be found in:
https://git1-us-west.apache.org/repos/asf?p=calcite.git;a=summary
but how to commit codes to apache git?
Regards
Zhiqiang He
RE: How to merge pull request in github?
Posted by zhiqiang <zh...@apache.org>.
Thanks Jesus, Josh and Julian.
-----Original Message-----
From: Julian Hyde [mailto:jhyde.apache@gmail.com]
Sent: Saturday, June 24, 2017 12:57 AM
To: dev@calcite.apache.org
Subject: Re: How to merge pull request in github?
A committer also needs to ensure IP hygiene, make sure that the code builds and tests pass, and make sure that the feature is appropriately "complete" (subjective, but usually involves adequate tests and documentation), and make sure that the contribution is in the best interests of the community.
Sorry this is a long list. But being a gatekeeper is an important task. If I weren't on vacation I'd find appropriate links to back this up. Also, we need to strengthen our doc of committer responsibilities in the FAQ.
Julian
> On Jun 23, 2017, at 08:49, Josh Elser <el...@apache.org> wrote:
>
> Right -- you cannot click the "Merge" button in the Github UI.
>
> Typically, you will pull down their changes locally, commit/test/verify them, and then push them to the Apache Git repo.
>
> Using the little trick "Closes apache/calcite#xxx" that Jesús mentioned, the pullrequest will be automatically closed after the commit is mirrored from the ASF back to Github.
>
>> On 6/23/17 7:32 AM, Jesus Camacho Rodriguez wrote:
>> The writable git repo is here:
>> https://git-wip-us.apache.org/repos/asf/calcite.git
>> GitHub will indeed mirror that repo.
>> You can find more information about git at the ASF here:
>> https://git.apache.org/
>> -Jesús
>>> On 6/23/17, 10:57 AM, "zhiqiang" <zh...@apache.org> wrote:
>>> But I can't merge other people's pull requests in github, maybe I did not have the rights to commit?
>>> Or I think we should comiit pull request to apache git first . not in github . And github can sync patches from apache mirror.
>>>
>>>
>>> -----Original Message-----
>>> From: Jesus Camacho Rodriguez [mailto:jcamachorodriguez@hortonworks.com] On Behalf Of Jesus Camacho Rodriguez
>>> Sent: Friday, June 23, 2017 5:42 PM
>>> To: zhiqiang; dev@calcite.apache.org
>>> Cc: jcamacho@apache.org; elserj@apache.org
>>> Subject: Re: How to merge pull request in github?
>>>
>>> If I understand your question right, you should probably rebase
>>> the PR before merging it into master.
>>> Then you should add to the commit message the reference to the PR,
>>> e.g., Close apache/calcite#xxx, and it will appear as merged.
>>>
>>>
>>> -Jesús
>>>
>>>> On 6/23/17, 10:22 AM, "zhiqiang" <zh...@apache.org> wrote:
>>>>
>>>> Hi all
>>>> How to merge pull requests in calcite github?
>>>> I saw all pull request was closed. but not merged in github.
>>>> All commits can be found in:
>>>> https://git1-us-west.apache.org/repos/asf?p=calcite.git;a=summary
>>>> but how to commit codes to apache git?
>>>>
>>>> Regards
>>>> Zhiqiang He
>>>>
>>>
Re: How to merge pull request in github?
Posted by Julian Hyde <jh...@gmail.com>.
A committer also needs to ensure IP hygiene, make sure that the code builds and tests pass, and make sure that the feature is appropriately "complete" (subjective, but usually involves adequate tests and documentation), and make sure that the contribution is in the best interests of the community.
Sorry this is a long list. But being a gatekeeper is an important task. If I weren't on vacation I'd find appropriate links to back this up. Also, we need to strengthen our doc of committer responsibilities in the FAQ.
Julian
> On Jun 23, 2017, at 08:49, Josh Elser <el...@apache.org> wrote:
>
> Right -- you cannot click the "Merge" button in the Github UI.
>
> Typically, you will pull down their changes locally, commit/test/verify them, and then push them to the Apache Git repo.
>
> Using the little trick "Closes apache/calcite#xxx" that Jesús mentioned, the pullrequest will be automatically closed after the commit is mirrored from the ASF back to Github.
>
>> On 6/23/17 7:32 AM, Jesus Camacho Rodriguez wrote:
>> The writable git repo is here:
>> https://git-wip-us.apache.org/repos/asf/calcite.git
>> GitHub will indeed mirror that repo.
>> You can find more information about git at the ASF here:
>> https://git.apache.org/
>> -Jesús
>>> On 6/23/17, 10:57 AM, "zhiqiang" <zh...@apache.org> wrote:
>>> But I can't merge other people's pull requests in github, maybe I did not have the rights to commit?
>>> Or I think we should comiit pull request to apache git first . not in github . And github can sync patches from apache mirror.
>>>
>>>
>>> -----Original Message-----
>>> From: Jesus Camacho Rodriguez [mailto:jcamachorodriguez@hortonworks.com] On Behalf Of Jesus Camacho Rodriguez
>>> Sent: Friday, June 23, 2017 5:42 PM
>>> To: zhiqiang; dev@calcite.apache.org
>>> Cc: jcamacho@apache.org; elserj@apache.org
>>> Subject: Re: How to merge pull request in github?
>>>
>>> If I understand your question right, you should probably rebase
>>> the PR before merging it into master.
>>> Then you should add to the commit message the reference to the PR,
>>> e.g., Close apache/calcite#xxx, and it will appear as merged.
>>>
>>>
>>> -Jesús
>>>
>>>> On 6/23/17, 10:22 AM, "zhiqiang" <zh...@apache.org> wrote:
>>>>
>>>> Hi all
>>>> How to merge pull requests in calcite github?
>>>> I saw all pull request was closed. but not merged in github.
>>>> All commits can be found in:
>>>> https://git1-us-west.apache.org/repos/asf?p=calcite.git;a=summary
>>>> but how to commit codes to apache git?
>>>>
>>>> Regards
>>>> Zhiqiang He
>>>>
>>>
Re: How to merge pull request in github?
Posted by Josh Elser <el...@apache.org>.
Right -- you cannot click the "Merge" button in the Github UI.
Typically, you will pull down their changes locally, commit/test/verify
them, and then push them to the Apache Git repo.
Using the little trick "Closes apache/calcite#xxx" that Jesús mentioned,
the pullrequest will be automatically closed after the commit is
mirrored from the ASF back to Github.
On 6/23/17 7:32 AM, Jesus Camacho Rodriguez wrote:
> The writable git repo is here:
> https://git-wip-us.apache.org/repos/asf/calcite.git
> GitHub will indeed mirror that repo.
>
> You can find more information about git at the ASF here:
> https://git.apache.org/
>
>
> -Jesús
>
>
>
>
> On 6/23/17, 10:57 AM, "zhiqiang" <zh...@apache.org> wrote:
>
>> But I can't merge other people's pull requests in github, maybe I did not have the rights to commit?
>> Or I think we should comiit pull request to apache git first . not in github . And github can sync patches from apache mirror.
>>
>>
>> -----Original Message-----
>> From: Jesus Camacho Rodriguez [mailto:jcamachorodriguez@hortonworks.com] On Behalf Of Jesus Camacho Rodriguez
>> Sent: Friday, June 23, 2017 5:42 PM
>> To: zhiqiang; dev@calcite.apache.org
>> Cc: jcamacho@apache.org; elserj@apache.org
>> Subject: Re: How to merge pull request in github?
>>
>> If I understand your question right, you should probably rebase
>> the PR before merging it into master.
>> Then you should add to the commit message the reference to the PR,
>> e.g., Close apache/calcite#xxx, and it will appear as merged.
>>
>>
>> -Jesús
>>
>> On 6/23/17, 10:22 AM, "zhiqiang" <zh...@apache.org> wrote:
>>
>>> Hi all
>>> How to merge pull requests in calcite github?
>>> I saw all pull request was closed. but not merged in github.
>>> All commits can be found in:
>>> https://git1-us-west.apache.org/repos/asf?p=calcite.git;a=summary
>>> but how to commit codes to apache git?
>>>
>>> Regards
>>> Zhiqiang He
>>>
>>
>
Re: How to merge pull request in github?
Posted by Jesus Camacho Rodriguez <jc...@apache.org>.
The writable git repo is here:
https://git-wip-us.apache.org/repos/asf/calcite.git
GitHub will indeed mirror that repo.
You can find more information about git at the ASF here:
https://git.apache.org/
-Jesús
On 6/23/17, 10:57 AM, "zhiqiang" <zh...@apache.org> wrote:
>But I can't merge other people's pull requests in github, maybe I did not have the rights to commit?
>Or I think we should comiit pull request to apache git first . not in github . And github can sync patches from apache mirror.
>
>
>-----Original Message-----
>From: Jesus Camacho Rodriguez [mailto:jcamachorodriguez@hortonworks.com] On Behalf Of Jesus Camacho Rodriguez
>Sent: Friday, June 23, 2017 5:42 PM
>To: zhiqiang; dev@calcite.apache.org
>Cc: jcamacho@apache.org; elserj@apache.org
>Subject: Re: How to merge pull request in github?
>
>If I understand your question right, you should probably rebase
>the PR before merging it into master.
>Then you should add to the commit message the reference to the PR,
>e.g., Close apache/calcite#xxx, and it will appear as merged.
>
>
>-Jesús
>
>On 6/23/17, 10:22 AM, "zhiqiang" <zh...@apache.org> wrote:
>
>>Hi all
>> How to merge pull requests in calcite github?
>> I saw all pull request was closed. but not merged in github.
>> All commits can be found in:
>> https://git1-us-west.apache.org/repos/asf?p=calcite.git;a=summary
>> but how to commit codes to apache git?
>>
>>Regards
>>Zhiqiang He
>>
>
RE: How to merge pull request in github?
Posted by zhiqiang <zh...@apache.org>.
But I can't merge other people's pull requests in github, maybe I did not have the rights to commit?
Or I think we should comiit pull request to apache git first . not in github . And github can sync patches from apache mirror.
-----Original Message-----
From: Jesus Camacho Rodriguez [mailto:jcamachorodriguez@hortonworks.com] On Behalf Of Jesus Camacho Rodriguez
Sent: Friday, June 23, 2017 5:42 PM
To: zhiqiang; dev@calcite.apache.org
Cc: jcamacho@apache.org; elserj@apache.org
Subject: Re: How to merge pull request in github?
If I understand your question right, you should probably rebase
the PR before merging it into master.
Then you should add to the commit message the reference to the PR,
e.g., Close apache/calcite#xxx, and it will appear as merged.
-Jesús
On 6/23/17, 10:22 AM, "zhiqiang" <zh...@apache.org> wrote:
>Hi all
> How to merge pull requests in calcite github?
> I saw all pull request was closed. but not merged in github.
> All commits can be found in:
> https://git1-us-west.apache.org/repos/asf?p=calcite.git;a=summary
> but how to commit codes to apache git?
>
>Regards
>Zhiqiang He
>
Re: How to merge pull request in github?
Posted by Jesus Camacho Rodriguez <jc...@apache.org>.
If I understand your question right, you should probably rebase
the PR before merging it into master.
Then you should add to the commit message the reference to the PR,
e.g., Close apache/calcite#xxx, and it will appear as merged.
-Jesús
On 6/23/17, 10:22 AM, "zhiqiang" <zh...@apache.org> wrote:
>Hi all
> How to merge pull requests in calcite github?
> I saw all pull request was closed. but not merged in github.
> All commits can be found in:
> https://git1-us-west.apache.org/repos/asf?p=calcite.git;a=summary
> but how to commit codes to apache git?
>
>Regards
>Zhiqiang He
>