maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Baptiste Mathus ...@batmat.net>
Subject Re: How do I merge pull request on GitHub?
Date Sun, 31 May 2015 08:39:23 GMT
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 <tamas@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ć <sslavic@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 <dennisl@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 !

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message