github pull requests

[Martin <ma...@apache.org>]

Hi Olivier,

how do you merge github pull requests into the master branch?
In your log statements I only see messages like 'merge branch pr/28', but 
these are not published branches as I see, I think you create them locally 
only?
How do you create them? And how does github recognize that the pr is merged 
into the master? The github email says you should add "This closes #30" to the 
commit message. But I see no such commit messages in your pr merges.

Greetings

Martin

Re: github pull requests

[Olivier Lamy <ol...@apache.org>]

Hi Martin
What you can do is to test the pr locally as a branch.
So if github is your github remote you can do: (look at the output of git
remote -v)
git fetch github pull/$ID/head:$BRANCHNAME
with $ID the pull request id and $BRANCHNAME with pr-$ID
then git checkout pr-$ID
check the changes etc...
then:
* git checkout master
* git merge $BRANCHNAME
verify the merge (shouldn't be a problem if github has marked the pr as no
conflict)
* git push origin master (if origin is the apache git repo)

Well I know this could be documented in the web site :-)




On 1 August 2017 at 07:35, Martin <ma...@apache.org> wrote:

> Hi Olivier,
>
> how do you merge github pull requests into the master branch?
> In your log statements I only see messages like 'merge branch pr/28', but
> these are not published branches as I see, I think you create them locally
> only?
> How do you create them? And how does github recognize that the pr is merged
> into the master? The github email says you should add "This closes #30" to
> the
> commit message. But I see no such commit messages in your pr merges.
>
> Greetings
>
> Martin
>



-- 
Olivier Lamy
http://twitter.com/olamy | http://linkedin.com/in/olamy