...
- GitHub pull-request
- Patch-file
1. GitHub pull-request
...
Create pull request
- You need to fork Mirror of have a fork of Apache Ignite at mirror on GitHub.
- Fix / implement JIRA ticket at the fork as one commit with a comment like "ignite-xxxx: Implemented"in your fork. Commit to remote branch.
- Create pull request from the new remote branch in the fork to Mirror of to Apache Ignite on GitHub
...
- master.
- TeamCity test builds will be triggered automatically and can be found by branch pattern trigger builds and label it as a "pull/<pull-request-number>/head"At ignite-xxxx Jira will be added a comment about new pull-request. Select this label in the branches dropdown and monitor test results.
- Once tests are passed, the pull request can be reviewed and merged by a committer.
Merge pull request (for committers)
To merge a pull request you need to have two remotes - one for Apache repo and another for GitHub mirror. They can be added like this:
git remote add apache https://git-wip-us.apache.org/repos/asf/incubator-ignite
git remote add upstream git@github.com:apache/incubator-ignite.git
To merge a pull request to Apache Ignite master do the following (replace <xxx>
with the pull request number):
- Go to you fork, make sure it doesn't have any uncommitted changes.
- Fetch pull request to a local branch:
- Merge from the new branch to master:
git merge --squash pr-<xxx>
- Commit to local master. Do not forget to specify author and provide a comment that will close the pull request (see https://help.github.com/articles/closing-issues-via-commit-messages/):
git commit --author=“John Doe <jdoe@apache.org>" -m “ignite-999 - Cool feature implemented. Closes #77.”
- Push to 'apache' remote:
+------------+ +---------------+ +-----------------+
...