Re: Need Instructions to merge PR from GitHub to Apache

[Jason van Zyl]

What others may do may differ but this is what I do.

For a given PR with a URL of, say, https://github.com/apache/maven/pull/67

wget https://github.com/apache/maven/pull/67.patch

git apply —stat 67.patch

This allows you to see what changes will be made.

git apply —check 67.patch

This let’s you see if there are any issues.

git am —signoff < 67.patch

Show’s that you, the Maven committer applying the patch on behalf of someone 
else, has signed off on the patch.

git commend —amend

Here I added a line to the commit to close the issue on Github



closes #67

Then I run the tests and if all is good I 

git push

> On Sep 19, 2015, at 8:08 PM, Dan Tran  wrote:
> 
> Hi,
> 
> I am still very new to Git.  Any instructions how to do this is greatly
> appreciated
> 
> Thanks
> 
> -Dan
> 
> ref: https://github.com/apache/maven-wagon/pull/16#issuecomment-141720699

Thanks,

Jason

--
Jason van Zyl
Founder, Takari and Apache Maven
http://twitter.com/jvanzyl
http://twitter.com/takari_io
-

A language that doesn’t affect the way you think about programming is not worth 
knowing. 
 
 -- Alan Perlis













-
To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
For additional commands, e-mail: dev-h...@maven.apache.org

Re: Need Instructions to merge PR from GitHub to Apache

[Dan Tran]

Thanks for instructions

I run into diff format error at git am —signoff, should i go ahead to
manually patch the source ( it is not that bad), or should I ask the author
to redo?

Thanks

-Dan

On Sat, Sep 19, 2015 at 5:30 PM, Jason van Zyl  wrote:

> What others may do may differ but this is what I do.
>
> For a given PR with a URL of, say, https://github.com/apache/maven/pull/67
>
> wget https://github.com/apache/maven/pull/67.patch
>
> git apply —stat 67.patch
>
> This allows you to see what changes will be made.
>
> git apply —check 67.patch
>
> This let’s you see if there are any issues.
>
> git am —signoff < 67.patch
>
> Show’s that you, the Maven committer applying the patch on behalf of
> someone else, has signed off on the patch.
>
> git commend —amend
>
> Here I added a line to the commit to close the issue on Github
>
> 
>
> closes #67
>
> Then I run the tests and if all is good I
>
> git push
>
> > On Sep 19, 2015, at 8:08 PM, Dan Tran  wrote:
> >
> > Hi,
> >
> > I am still very new to Git.  Any instructions how to do this is greatly
> > appreciated
> >
> > Thanks
> >
> > -Dan
> >
> > ref:
> https://github.com/apache/maven-wagon/pull/16#issuecomment-141720699
>
> Thanks,
>
> Jason
>
> --
> Jason van Zyl
> Founder, Takari and Apache Maven
> http://twitter.com/jvanzyl
> http://twitter.com/takari_io
> -
>
> A language that doesn’t affect the way you think about programming is not
> worth knowing.
>
>  -- Alan Perlis
>
>
>
>
>
>
>
>
>
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org
> For additional commands, e-mail: dev-h...@maven.apache.org
>
>