You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by Dennis Lundberg <de...@apache.org> on 2015/05/29 09:27:22 UTC
How do I merge pull request on GitHub?
Hi
I'm going through the issue list in JIRA for maven-pmd-plugin and want
to apply some patches that have been submitted as pull requests to our
GitHub mirror. But I cannot find a way to merge the pull requests. On
the page of the pull request it says:
This pull request can be automatically merged by project collaborators.
Only those with write access to this repository can merge pull requests.
Am I missing some permissions or am I just lacking Git(Hub) knowledge?
My github id is dennisl. Here is an example:
https://github.com/apache/maven-plugins/pull/48
--
Dennis Lundberg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: How do I merge pull request on GitHub?
Posted by Stevo Slavić <ss...@gmail.com>.
workflow is:
contributor branch@github and submitts PR to --> Apache GitHub mirror -->
committer merges PR in clone @ local and push to --> git-wip-us.apache.org
--> changes are synced to Apache GitHub mirror with all side-effects
(issue/PR closed) because of comment in merge commit message
On Fri, May 29, 2015 at 11:00 AM, Dennis Lundberg <de...@apache.org>
wrote:
> Thanks Stevo,
>
> Interesting read for me that is less than fluent in git. In this case
> I unfortunatelly cannot use those instructions as maven-plugins does
> not have a git repo at Apache. It is versioned in svn and is probably
> using some svn->git mirroring software to end up on the GitHub mirror
> at
> https://github.com/apache/maven-plugins
>
> Do you know if the Apache GitHub repo is read-only? Would it be
> possible to merge the PR at GitHub and get that commit propagated back
> to our canonical svn repo?
>
> If I understand your instructions correctly the modifications goes
> something like this:
> contributor branch@github --> git-wip-us.apache.org --> Apache GitHub
> mirror
>
> What I think that I need is this:
> contributor branch@github --> Apache GitHub mirror --> svn.apache.org
>
>
> On Fri, May 29, 2015 at 9:38 AM, Stevo Slavić <ss...@gmail.com> wrote:
> > On Apache Mahout project we have nice docs on the workflow to merge or
> > reject PRs submitted to github mirror. Maybe it works for you too.
> >
> > Kind regards,
> > Stevo Slavic.
> >
> > On Fri, May 29, 2015 at 9:27 AM, Dennis Lundberg <de...@apache.org>
> wrote:
> >
> >> Hi
> >>
> >> I'm going through the issue list in JIRA for maven-pmd-plugin and want
> >> to apply some patches that have been submitted as pull requests to our
> >> GitHub mirror. But I cannot find a way to merge the pull requests. On
> >> the page of the pull request it says:
> >>
> >> This pull request can be automatically merged by project
> collaborators.
> >> Only those with write access to this repository can merge pull
> requests.
> >>
> >> Am I missing some permissions or am I just lacking Git(Hub) knowledge?
> >> My github id is dennisl. Here is an example:
> >> https://github.com/apache/maven-plugins/pull/48
> >>
> >> --
> >> Dennis Lundberg
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> >> For additional commands, e-mail: dev-help@maven.apache.org
> >>
> >>
>
>
>
> --
> Dennis Lundberg
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
Re: How do I merge pull request on GitHub?
Posted by Dennis Lundberg <de...@apache.org>.
My solution to use SmartGit seems to be working fine. Source code
changes are moving nicely from my local disk to svn, and then on to
the GitHub mirror. Pull requests in GitHub are closed automatically.
Thanks for the help!
On Fri, May 29, 2015 at 2:47 PM, Dennis Lundberg <de...@apache.org> wrote:
> Thanks again Tamas,
>
> I have already tried that, but neither the patch nor diff would apply
> cleanly to my svn working copy.
>
> Trying another approach checking out from svn using SmartGit, which
> keeps a local git repo of sources that come from a remote svn repo.
> That way I was able to apply the patch in the format you suggested.
> The first commit/push seems to have gone through OK. Now I'm waiting
> to see if my "closes apache/maven-plugins#NN" text in the commit
> message will close the GitHub pull request automatically. Does anyone
> know the sync delay between svn.apache.org and the GitHub mirror?
>
>
> On Fri, May 29, 2015 at 1:29 PM, Tamas Cservenak <ta...@cservenak.net> wrote:
>> Sry, I sent the “resolved” URL, here is the real one:
>>
>> https://github.com/apache/maven-plugins/pull/48.diff
>>
>>
>> --
>> Thanks,
>> ~t~
>>
>> On 29 May 2015 at 13:27:47, Tamas Cservenak (tamas@cservenak.net) wrote:
>>
>> Dennis,
>>
>> you can take PRs as patches from GH by appending “.patch” or “.diff” to PR URL,
>> here is your example:
>>
>> https://patch-diff.githubusercontent.com/raw/apache/maven-plugins/pull/48.diff
>>
>> Then, apply that patch “manually” to sources and then commit. Is a bit
>> hassle but that’s all to it. Having all this in git would be way more simpler.
>>
>> HTH
>>
>> --
>> Thanks,
>> ~t~
>>
>> On 29 May 2015 at 11:00:59, Dennis Lundberg (dennisl@apache.org) wrote:
>>
>> Thanks Stevo,
>>
>> Interesting read for me that is less than fluent in git. In this case
>> I unfortunatelly cannot use those instructions as maven-plugins does
>> not have a git repo at Apache. It is versioned in svn and is probably
>> using some svn->git mirroring software to end up on the GitHub mirror
>> at
>> https://github.com/apache/maven-plugins
>>
>> Do you know if the Apache GitHub repo is read-only? Would it be
>> possible to merge the PR at GitHub and get that commit propagated back
>> to our canonical svn repo?
>>
>> If I understand your instructions correctly the modifications goes
>> something like this:
>> contributor branch@github --> git-wip-us.apache.org --> Apache GitHub mirror
>>
>> What I think that I need is this:
>> contributor branch@github --> Apache GitHub mirror --> svn.apache.org
>>
>>
>> On Fri, May 29, 2015 at 9:38 AM, Stevo Slavić <ss...@gmail.com> wrote:
>>> On Apache Mahout project we have nice docs on the workflow to merge or
>>> reject PRs submitted to github mirror. Maybe it works for you too.
>>>
>>> Kind regards,
>>> Stevo Slavic.
>>>
>>> On Fri, May 29, 2015 at 9:27 AM, Dennis Lundberg <de...@apache.org> wrote:
>>>
>>>> Hi
>>>>
>>>> I'm going through the issue list in JIRA for maven-pmd-plugin and want
>>>> to apply some patches that have been submitted as pull requests to our
>>>> GitHub mirror. But I cannot find a way to merge the pull requests. On
>>>> the page of the pull request it says:
>>>>
>>>> This pull request can be automatically merged by project collaborators.
>>>> Only those with write access to this repository can merge pull requests.
>>>>
>>>> Am I missing some permissions or am I just lacking Git(Hub) knowledge?
>>>> My github id is dennisl. Here is an example:
>>>> https://github.com/apache/maven-plugins/pull/48
>>>>
>>>> --
>>>> Dennis Lundberg
>>>>
>>>> ---------------------------------------------------------------------
>>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>>>> For additional commands, e-mail: dev-help@maven.apache.org
>>>>
>>>>
>>
>>
>>
>> --
>> Dennis Lundberg
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>
>
>
> --
> Dennis Lundberg
--
Dennis Lundberg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: How do I merge pull request on GitHub?
Posted by Dennis Lundberg <de...@apache.org>.
Thanks again Tamas,
I have already tried that, but neither the patch nor diff would apply
cleanly to my svn working copy.
Trying another approach checking out from svn using SmartGit, which
keeps a local git repo of sources that come from a remote svn repo.
That way I was able to apply the patch in the format you suggested.
The first commit/push seems to have gone through OK. Now I'm waiting
to see if my "closes apache/maven-plugins#NN" text in the commit
message will close the GitHub pull request automatically. Does anyone
know the sync delay between svn.apache.org and the GitHub mirror?
On Fri, May 29, 2015 at 1:29 PM, Tamas Cservenak <ta...@cservenak.net> wrote:
> Sry, I sent the “resolved” URL, here is the real one:
>
> https://github.com/apache/maven-plugins/pull/48.diff
>
>
> --
> Thanks,
> ~t~
>
> On 29 May 2015 at 13:27:47, Tamas Cservenak (tamas@cservenak.net) wrote:
>
> Dennis,
>
> you can take PRs as patches from GH by appending “.patch” or “.diff” to PR URL,
> here is your example:
>
> https://patch-diff.githubusercontent.com/raw/apache/maven-plugins/pull/48.diff
>
> Then, apply that patch “manually” to sources and then commit. Is a bit
> hassle but that’s all to it. Having all this in git would be way more simpler.
>
> HTH
>
> --
> Thanks,
> ~t~
>
> On 29 May 2015 at 11:00:59, Dennis Lundberg (dennisl@apache.org) wrote:
>
> Thanks Stevo,
>
> Interesting read for me that is less than fluent in git. In this case
> I unfortunatelly cannot use those instructions as maven-plugins does
> not have a git repo at Apache. It is versioned in svn and is probably
> using some svn->git mirroring software to end up on the GitHub mirror
> at
> https://github.com/apache/maven-plugins
>
> Do you know if the Apache GitHub repo is read-only? Would it be
> possible to merge the PR at GitHub and get that commit propagated back
> to our canonical svn repo?
>
> If I understand your instructions correctly the modifications goes
> something like this:
> contributor branch@github --> git-wip-us.apache.org --> Apache GitHub mirror
>
> What I think that I need is this:
> contributor branch@github --> Apache GitHub mirror --> svn.apache.org
>
>
> On Fri, May 29, 2015 at 9:38 AM, Stevo Slavić <ss...@gmail.com> wrote:
>> On Apache Mahout project we have nice docs on the workflow to merge or
>> reject PRs submitted to github mirror. Maybe it works for you too.
>>
>> Kind regards,
>> Stevo Slavic.
>>
>> On Fri, May 29, 2015 at 9:27 AM, Dennis Lundberg <de...@apache.org> wrote:
>>
>>> Hi
>>>
>>> I'm going through the issue list in JIRA for maven-pmd-plugin and want
>>> to apply some patches that have been submitted as pull requests to our
>>> GitHub mirror. But I cannot find a way to merge the pull requests. On
>>> the page of the pull request it says:
>>>
>>> This pull request can be automatically merged by project collaborators.
>>> Only those with write access to this repository can merge pull requests.
>>>
>>> Am I missing some permissions or am I just lacking Git(Hub) knowledge?
>>> My github id is dennisl. Here is an example:
>>> https://github.com/apache/maven-plugins/pull/48
>>>
>>> --
>>> Dennis Lundberg
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>>> For additional commands, e-mail: dev-help@maven.apache.org
>>>
>>>
>
>
>
> --
> Dennis Lundberg
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
--
Dennis Lundberg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: How do I merge pull request on GitHub?
Posted by Baptiste Mathus <ml...@batmat.net>.
Beware that using the diff format, you're gonna lose the commit information
(author, committer...). With SVN you don't have any other choice, but with
Git it would be a waste IMO.
Cheers
2015-05-29 13:29 GMT+02:00 Tamas Cservenak <ta...@cservenak.net>:
> Sry, I sent the “resolved” URL, here is the real one:
>
> https://github.com/apache/maven-plugins/pull/48.diff
>
>
> --
> Thanks,
> ~t~
>
> On 29 May 2015 at 13:27:47, Tamas Cservenak (tamas@cservenak.net) wrote:
>
> Dennis,
>
> you can take PRs as patches from GH by appending “.patch” or “.diff” to PR
> URL,
> here is your example:
>
>
> https://patch-diff.githubusercontent.com/raw/apache/maven-plugins/pull/48.diff
>
> Then, apply that patch “manually” to sources and then commit. Is a bit
> hassle but that’s all to it. Having all this in git would be way more
> simpler.
>
> HTH
>
> --
> Thanks,
> ~t~
>
> On 29 May 2015 at 11:00:59, Dennis Lundberg (dennisl@apache.org) wrote:
>
> Thanks Stevo,
>
> Interesting read for me that is less than fluent in git. In this case
> I unfortunatelly cannot use those instructions as maven-plugins does
> not have a git repo at Apache. It is versioned in svn and is probably
> using some svn->git mirroring software to end up on the GitHub mirror
> at
> https://github.com/apache/maven-plugins
>
> Do you know if the Apache GitHub repo is read-only? Would it be
> possible to merge the PR at GitHub and get that commit propagated back
> to our canonical svn repo?
>
> If I understand your instructions correctly the modifications goes
> something like this:
> contributor branch@github --> git-wip-us.apache.org --> Apache GitHub
> mirror
>
> What I think that I need is this:
> contributor branch@github --> Apache GitHub mirror --> svn.apache.org
>
>
> On Fri, May 29, 2015 at 9:38 AM, Stevo Slavić <ss...@gmail.com> wrote:
> > On Apache Mahout project we have nice docs on the workflow to merge or
> > reject PRs submitted to github mirror. Maybe it works for you too.
> >
> > Kind regards,
> > Stevo Slavic.
> >
> > On Fri, May 29, 2015 at 9:27 AM, Dennis Lundberg <de...@apache.org>
> wrote:
> >
> >> Hi
> >>
> >> I'm going through the issue list in JIRA for maven-pmd-plugin and want
> >> to apply some patches that have been submitted as pull requests to our
> >> GitHub mirror. But I cannot find a way to merge the pull requests. On
> >> the page of the pull request it says:
> >>
> >> This pull request can be automatically merged by project collaborators.
> >> Only those with write access to this repository can merge pull requests.
> >>
> >> Am I missing some permissions or am I just lacking Git(Hub) knowledge?
> >> My github id is dennisl. Here is an example:
> >> https://github.com/apache/maven-plugins/pull/48
> >>
> >> --
> >> Dennis Lundberg
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> >> For additional commands, e-mail: dev-help@maven.apache.org
> >>
> >>
>
>
>
> --
> Dennis Lundberg
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
--
Baptiste <Batmat> MATHUS - http://batmat.net
Sauvez un arbre,
Mangez un castor !
Re: How do I merge pull request on GitHub?
Posted by Tamas Cservenak <ta...@cservenak.net>.
Sry, I sent the “resolved” URL, here is the real one:
https://github.com/apache/maven-plugins/pull/48.diff
--
Thanks,
~t~
On 29 May 2015 at 13:27:47, Tamas Cservenak (tamas@cservenak.net) wrote:
Dennis,
you can take PRs as patches from GH by appending “.patch” or “.diff” to PR URL,
here is your example:
https://patch-diff.githubusercontent.com/raw/apache/maven-plugins/pull/48.diff
Then, apply that patch “manually” to sources and then commit. Is a bit
hassle but that’s all to it. Having all this in git would be way more simpler.
HTH
--
Thanks,
~t~
On 29 May 2015 at 11:00:59, Dennis Lundberg (dennisl@apache.org) wrote:
Thanks Stevo,
Interesting read for me that is less than fluent in git. In this case
I unfortunatelly cannot use those instructions as maven-plugins does
not have a git repo at Apache. It is versioned in svn and is probably
using some svn->git mirroring software to end up on the GitHub mirror
at
https://github.com/apache/maven-plugins
Do you know if the Apache GitHub repo is read-only? Would it be
possible to merge the PR at GitHub and get that commit propagated back
to our canonical svn repo?
If I understand your instructions correctly the modifications goes
something like this:
contributor branch@github --> git-wip-us.apache.org --> Apache GitHub mirror
What I think that I need is this:
contributor branch@github --> Apache GitHub mirror --> svn.apache.org
On Fri, May 29, 2015 at 9:38 AM, Stevo Slavić <ss...@gmail.com> wrote:
> On Apache Mahout project we have nice docs on the workflow to merge or
> reject PRs submitted to github mirror. Maybe it works for you too.
>
> Kind regards,
> Stevo Slavic.
>
> On Fri, May 29, 2015 at 9:27 AM, Dennis Lundberg <de...@apache.org> wrote:
>
>> Hi
>>
>> I'm going through the issue list in JIRA for maven-pmd-plugin and want
>> to apply some patches that have been submitted as pull requests to our
>> GitHub mirror. But I cannot find a way to merge the pull requests. On
>> the page of the pull request it says:
>>
>> This pull request can be automatically merged by project collaborators.
>> Only those with write access to this repository can merge pull requests.
>>
>> Am I missing some permissions or am I just lacking Git(Hub) knowledge?
>> My github id is dennisl. Here is an example:
>> https://github.com/apache/maven-plugins/pull/48
>>
>> --
>> Dennis Lundberg
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>>
--
Dennis Lundberg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: How do I merge pull request on GitHub?
Posted by Tamas Cservenak <ta...@cservenak.net>.
Dennis,
you can take PRs as patches from GH by appending “.patch” or “.diff” to PR URL,
here is your example:
https://patch-diff.githubusercontent.com/raw/apache/maven-plugins/pull/48.diff
Then, apply that patch “manually” to sources and then commit. Is a bit
hassle but that’s all to it. Having all this in git would be way more simpler.
HTH
--
Thanks,
~t~
On 29 May 2015 at 11:00:59, Dennis Lundberg (dennisl@apache.org) wrote:
Thanks Stevo,
Interesting read for me that is less than fluent in git. In this case
I unfortunatelly cannot use those instructions as maven-plugins does
not have a git repo at Apache. It is versioned in svn and is probably
using some svn->git mirroring software to end up on the GitHub mirror
at
https://github.com/apache/maven-plugins
Do you know if the Apache GitHub repo is read-only? Would it be
possible to merge the PR at GitHub and get that commit propagated back
to our canonical svn repo?
If I understand your instructions correctly the modifications goes
something like this:
contributor branch@github --> git-wip-us.apache.org --> Apache GitHub mirror
What I think that I need is this:
contributor branch@github --> Apache GitHub mirror --> svn.apache.org
On Fri, May 29, 2015 at 9:38 AM, Stevo Slavić <ss...@gmail.com> wrote:
> On Apache Mahout project we have nice docs on the workflow to merge or
> reject PRs submitted to github mirror. Maybe it works for you too.
>
> Kind regards,
> Stevo Slavic.
>
> On Fri, May 29, 2015 at 9:27 AM, Dennis Lundberg <de...@apache.org> wrote:
>
>> Hi
>>
>> I'm going through the issue list in JIRA for maven-pmd-plugin and want
>> to apply some patches that have been submitted as pull requests to our
>> GitHub mirror. But I cannot find a way to merge the pull requests. On
>> the page of the pull request it says:
>>
>> This pull request can be automatically merged by project collaborators.
>> Only those with write access to this repository can merge pull requests.
>>
>> Am I missing some permissions or am I just lacking Git(Hub) knowledge?
>> My github id is dennisl. Here is an example:
>> https://github.com/apache/maven-plugins/pull/48
>>
>> --
>> Dennis Lundberg
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>>
--
Dennis Lundberg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: How do I merge pull request on GitHub?
Posted by Dennis Lundberg <de...@apache.org>.
Thanks Stevo,
Interesting read for me that is less than fluent in git. In this case
I unfortunatelly cannot use those instructions as maven-plugins does
not have a git repo at Apache. It is versioned in svn and is probably
using some svn->git mirroring software to end up on the GitHub mirror
at
https://github.com/apache/maven-plugins
Do you know if the Apache GitHub repo is read-only? Would it be
possible to merge the PR at GitHub and get that commit propagated back
to our canonical svn repo?
If I understand your instructions correctly the modifications goes
something like this:
contributor branch@github --> git-wip-us.apache.org --> Apache GitHub mirror
What I think that I need is this:
contributor branch@github --> Apache GitHub mirror --> svn.apache.org
On Fri, May 29, 2015 at 9:38 AM, Stevo Slavić <ss...@gmail.com> wrote:
> On Apache Mahout project we have nice docs on the workflow to merge or
> reject PRs submitted to github mirror. Maybe it works for you too.
>
> Kind regards,
> Stevo Slavic.
>
> On Fri, May 29, 2015 at 9:27 AM, Dennis Lundberg <de...@apache.org> wrote:
>
>> Hi
>>
>> I'm going through the issue list in JIRA for maven-pmd-plugin and want
>> to apply some patches that have been submitted as pull requests to our
>> GitHub mirror. But I cannot find a way to merge the pull requests. On
>> the page of the pull request it says:
>>
>> This pull request can be automatically merged by project collaborators.
>> Only those with write access to this repository can merge pull requests.
>>
>> Am I missing some permissions or am I just lacking Git(Hub) knowledge?
>> My github id is dennisl. Here is an example:
>> https://github.com/apache/maven-plugins/pull/48
>>
>> --
>> Dennis Lundberg
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>>
--
Dennis Lundberg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: How do I merge pull request on GitHub?
Posted by Stevo Slavić <ss...@gmail.com>.
https://mahout.apache.org/developers/github.html
On Fri, May 29, 2015 at 9:38 AM, Stevo Slavić <ss...@gmail.com> wrote:
> On Apache Mahout project we have nice docs on the workflow to merge or
> reject PRs submitted to github mirror. Maybe it works for you too.
>
> Kind regards,
> Stevo Slavic.
>
> On Fri, May 29, 2015 at 9:27 AM, Dennis Lundberg <de...@apache.org>
> wrote:
>
>> Hi
>>
>> I'm going through the issue list in JIRA for maven-pmd-plugin and want
>> to apply some patches that have been submitted as pull requests to our
>> GitHub mirror. But I cannot find a way to merge the pull requests. On
>> the page of the pull request it says:
>>
>> This pull request can be automatically merged by project collaborators.
>> Only those with write access to this repository can merge pull requests.
>>
>> Am I missing some permissions or am I just lacking Git(Hub) knowledge?
>> My github id is dennisl. Here is an example:
>> https://github.com/apache/maven-plugins/pull/48
>>
>> --
>> Dennis Lundberg
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>>
>
Re: How do I merge pull request on GitHub?
Posted by Stevo Slavić <ss...@gmail.com>.
On Apache Mahout project we have nice docs on the workflow to merge or
reject PRs submitted to github mirror. Maybe it works for you too.
Kind regards,
Stevo Slavic.
On Fri, May 29, 2015 at 9:27 AM, Dennis Lundberg <de...@apache.org> wrote:
> Hi
>
> I'm going through the issue list in JIRA for maven-pmd-plugin and want
> to apply some patches that have been submitted as pull requests to our
> GitHub mirror. But I cannot find a way to merge the pull requests. On
> the page of the pull request it says:
>
> This pull request can be automatically merged by project collaborators.
> Only those with write access to this repository can merge pull requests.
>
> Am I missing some permissions or am I just lacking Git(Hub) knowledge?
> My github id is dennisl. Here is an example:
> https://github.com/apache/maven-plugins/pull/48
>
> --
> Dennis Lundberg
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
Re: How do I merge pull request on GitHub?
Posted by Dennis Lundberg <de...@apache.org>.
Thanks Olivier,
I found something similar here:
https://wiki.apache.org/general/GitAtApache
But those instructions doesn't include the clever handling of
pr-branches that you suggested.
On Fri, May 29, 2015 at 1:49 PM, Olivier Lamy <ol...@apache.org> wrote:
> something not complicated which is convenient with pr
>
> git clone https://github.com/apache/maven-plugins.git
>
> now you have to setup git-svn (see the script here:
> https://gist.github.com/olamy/836acac9a113c7830918)
>
> Now setup you git config to have all pr as branch
> in .git/config add the last line
>
> [remote "origin"]
> url = https://github.com/apache/maven-plugins.git
> fetch = +refs/heads/*:refs/remotes/origin/*
> fetch = +refs/pull/*/head:refs/remotes/origin/pr/*
>
> then git fetch origin
> now you can checkout locally all pr as a branch
> git checkout pr/52
> test etc.... (maybe commit some modification in the pr/branch)
> git checkout trunk (back to trunk)
> merge the pr: git merge pr/52
> now commit to svn: git svn dcommit
>
>
>
>
>
>
>
> On 29 May 2015 at 17:27, Dennis Lundberg <de...@apache.org> wrote:
>
>> Hi
>>
>> I'm going through the issue list in JIRA for maven-pmd-plugin and want
>> to apply some patches that have been submitted as pull requests to our
>> GitHub mirror. But I cannot find a way to merge the pull requests. On
>> the page of the pull request it says:
>>
>> This pull request can be automatically merged by project collaborators.
>> Only those with write access to this repository can merge pull requests.
>>
>> Am I missing some permissions or am I just lacking Git(Hub) knowledge?
>> My github id is dennisl. Here is an example:
>> https://github.com/apache/maven-plugins/pull/48
>>
>> --
>> Dennis Lundberg
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>>
>
>
> --
> Olivier Lamy
> http://twitter.com/olamy | http://linkedin.com/in/olamy
--
Dennis Lundberg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: How do I merge pull request on GitHub?
Posted by Olivier Lamy <ol...@apache.org>.
something not complicated which is convenient with pr
git clone https://github.com/apache/maven-plugins.git
now you have to setup git-svn (see the script here:
https://gist.github.com/olamy/836acac9a113c7830918)
Now setup you git config to have all pr as branch
in .git/config add the last line
[remote "origin"]
url = https://github.com/apache/maven-plugins.git
fetch = +refs/heads/*:refs/remotes/origin/*
fetch = +refs/pull/*/head:refs/remotes/origin/pr/*
then git fetch origin
now you can checkout locally all pr as a branch
git checkout pr/52
test etc.... (maybe commit some modification in the pr/branch)
git checkout trunk (back to trunk)
merge the pr: git merge pr/52
now commit to svn: git svn dcommit
On 29 May 2015 at 17:27, Dennis Lundberg <de...@apache.org> wrote:
> Hi
>
> I'm going through the issue list in JIRA for maven-pmd-plugin and want
> to apply some patches that have been submitted as pull requests to our
> GitHub mirror. But I cannot find a way to merge the pull requests. On
> the page of the pull request it says:
>
> This pull request can be automatically merged by project collaborators.
> Only those with write access to this repository can merge pull requests.
>
> Am I missing some permissions or am I just lacking Git(Hub) knowledge?
> My github id is dennisl. Here is an example:
> https://github.com/apache/maven-plugins/pull/48
>
> --
> Dennis Lundberg
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
--
Olivier Lamy
http://twitter.com/olamy | http://linkedin.com/in/olamy
Re: How do I merge pull request on GitHub?
Posted by Dennis Lundberg <de...@apache.org>.
Thanks Tibor,
This will not work in my case, because maven-plugin does not have a
git repo at git-wip-us.apache.org.
On Fri, May 29, 2015 at 12:49 PM, Tibor Digana <ti...@apache.org> wrote:
> These are my commands for surefire plugin. Use your login and pmd project
> links instead.
> Suppose their branch is "s2" and master is on git-wip-us-apache.org.
> If you want to push from master to master, freely avoid s2:master.
> You should have RSA key in your user home.
>
> $ git remote add apache
> https://git-wip-us.apache.org/repos/asf/maven-surefire.git
> $ git fetch apache
> $ git rebase apache/master
> $ git config remote.origin.url
> https://git-wip-us.apache.org/repos/asf/maven-surefire.git
> $ git push -u
> https://tibordigana@git-wip-us.apache.org/repos/asf/maven-surefire.git
> s2:master
>
>
>
> --
> View this message in context: http://maven.40175.n5.nabble.com/How-do-I-merge-pull-request-on-GitHub-tp5836085p5836114.html
> Sent from the Maven Developers mailing list archive at Nabble.com.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
--
Dennis Lundberg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: How do I merge pull request on GitHub?
Posted by Tibor Digana <ti...@apache.org>.
These are my commands for surefire plugin. Use your login and pmd project
links instead.
Suppose their branch is "s2" and master is on git-wip-us-apache.org.
If you want to push from master to master, freely avoid s2:master.
You should have RSA key in your user home.
$ git remote add apache
https://git-wip-us.apache.org/repos/asf/maven-surefire.git
$ git fetch apache
$ git rebase apache/master
$ git config remote.origin.url
https://git-wip-us.apache.org/repos/asf/maven-surefire.git
$ git push -u
https://tibordigana@git-wip-us.apache.org/repos/asf/maven-surefire.git
s2:master
--
View this message in context: http://maven.40175.n5.nabble.com/How-do-I-merge-pull-request-on-GitHub-tp5836085p5836114.html
Sent from the Maven Developers mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org