Repository: incubator-twill Updated Branches: refs/heads/site 79c1dcf11 -> 75cb0a285
Added guide on how to merge code. Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/48f8be4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/48f8be4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/48f8be4c Branch: refs/heads/site Commit: 48f8be4c20e0c4df9a9f8856222bef2661845852 Parents: 79c1dcf Author: Terence Yim <[email protected]> Authored: Thu Jul 30 13:27:33 2015 -0700 Committer: Terence Yim <[email protected]> Committed: Thu Jul 30 13:59:22 2015 -0700 ---------------------------------------------------------------------- src/site/markdown/HowToContribute.md | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/48f8be4c/src/site/markdown/HowToContribute.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/HowToContribute.md b/src/site/markdown/HowToContribute.md index a51393b..eacbd9b 100644 --- a/src/site/markdown/HowToContribute.md +++ b/src/site/markdown/HowToContribute.md @@ -48,4 +48,24 @@ these steps to get your contributions in: 5. Please prefix your pull request title with the JIRA issue ID; for example, `(TWILL-87) Adding container placement policy`. 6. Please complete the pull request description with additional details as appropriate. 7. Once sent, code review will be done through the pull request. -8. Once all review issues are resolved, we will merge the changes into the `master` branch of the Apache Twill repo. \ No newline at end of file +8. Once all review issues are resolved, we will merge the changes into the `master` branch of the Apache Twill repo. + +### How to Merge Code Changes + +Committer can merge code changes that are already reviewed into the `master` branch with the following steps: + +1. Make sure the GitHub pull request is squashed into one commit. If not, ask the patch contributor to help doing so. + +2. Download the patch file from GitHub. You can append `.patch` to the end of the GitHub pull request URL to get the patch file. + + curl -L -O https://github.com/apache/incubator-twill/pull/${PR_NUMBER}.patch +3. Edit the patch file and add the following line in the commit message for closing the pull request. + + This closes #${PR_NUMBER} from GitHub. +4. Apply the patch and push it back to remote repo. Make sure you apply it on the latest `master` branch. + + git checkout master + git pull origin master + git am --signoff < ${PR_NUMBER} + git push origin master +5. Close the JIRA issue associated with the patch. \ No newline at end of file
