...
Clone the ASF git repository (if you haven't done yet)
Code Block git clone https://git-wip-us.apache.org/repos/asf/incubator-geode.git
Add GitHub remote
Code Block git remote add github https://github.com/apache/incubator-geode
(for local review) Fetch the pull request into a feature branch for review
Code Block git fetch github pull/6/head:feature/GEODE-41 git checkout feature/GEODE-41 Where: 6 -> PR number feature/GEODE-41 -> local destination branch
(for local review) After review is complete you can merge the feature into develop and remove the branch
Code Block git flow feature finish -rF GEODE-41 Switched to branch 'develop' Your branch is up-to-date with 'origin/develop'. Updating f7af251..1f2e32a Fast-forward COMPILING.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Deleted branch feature/GEODE-41 (was 1f2e32a). Summary of actions: - The feature branch 'feature/GEODE-41' was merged into 'develop' - Feature branch 'feature/GEODE-41' has been removed - You are now on branch 'develop'
- Review the changes and rebase if necessary to clean up and modify the history. If there are multiple commits, you may want to squash them together. Remember to add 'This closes #6' to the last commit message so that github will automatically close the PR. If the PR is comprised of just one commit, you can omit the rebase and simply add 'This closes #6' by using '
commit --amend
'.Code Block git log git rebase -i
- Finally push the commit to the origin repository
Code Block |
---|
git push origin |
Given the commit message with the PR number after the push the PR on GitHub will be closed and the JIRA ticket updated.
When using git log command you will see that Author: and Committer: fields are properly updated and credit is given to the contributor. For example:
Code Block |
---|
commit c562d3439577c0bf12cc0e39157761a8dd69da1f Author: Dan Smith <dsmith@pivotal.io> Commit: William Markito <wmarkito@pivotal.io> |
Rejecting PRs without committing
If reviewers or committers needs to close a PR if for instance, after proper evaluation it's something that won't get fixed it can be done through an empty commit message
Code Block |
---|
git commit --allow-empty -m "Closes #6 *Won't fix*" git push origin |
Website publishing
Geode website is maintained as part of the repository under the gemfire-site/ folder. We use JBake template management system to turn markdown (.md) templates into static html pages. Those static html pages can then be published as http://geode.incubator.apache.org by committing them to a dedicated publishing branch in Geode's repo: asf-site. The whole process is automated using Gradle tasks and consists of the following steps:
- Make sure that you've got Gradle and Java installed:
https://docs.gradle.org/current/userguide/installation.html
https://gradle.org/downloads/ - Check out our official repo:
$ git clone https://git-wip-us.apache.org/repos/asf/incubator-geode.git
$ cd incubator-geode
$ git checkout develop - Go to the website content folder:
$ cd gemfire-site Edit the content in a usual manner (md files are located under src/jbake/content)
Take a look at you changed by building and running the website via:
$ gradle jbakeRun
and navigating to: http://localhost:8820If you're satisfied with the result make sure to commit the changes to md files to the develop branch
Finally publish the website via running:
$ gradle jbakePublish
- Make sure that you've got Gradle and Java installed: