ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Bodewig <bode...@apache.org>
Subject Re: Process for handling GitHub PRs and closing them
Date Mon, 19 Jun 2017 06:30:04 GMT
On 2017-06-19, Jaikiran Pai wrote:

> We have (read only) github repos which back our main ASF git repos
> (consider the github ant-ivy repo which is a read-only mirror of ASF
> git repo). Users submit pull requests to our github repos and the
> process I follow for merging such PRs is the “rebase” approach which
> looks something like this:

> - Fetch the PR locally (git fetch github pull/45/head:pr-45)
> - Checkout to that branch locally (git checkout pr-45)
> - Rebase that PR on top of latest ASF (upstream) repo (git rebase asf/master)
> - Run a short build, verify and push to ASF repo (git push asf pr-45:master)

I tend to download 45.patch and "git am" it, but that's almost the same
as your first two steps. Most of the time I don't need to rebase. OTOH I
haven't got any problem with merge commits for PRs :-)

> Apparently, the way to have the pull request closed is doing a actual
> “merge” of the pull request commits into the ASF repo instead of
> rebasing the commits.

I'm not sure whether merging actually closes the PR, I've almost always
been forced to use a "closes #45" commit.

Most of the time there is some additional commit you have to perform,
like keeping track of the change inside the changelog. I use this extra
commit to close the PR. Not sure whether this is a best practice or even
a good practice.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message