...
- Update the local fork with the new branch
quickstep-101
.- If the new branch is in the ASF repo, do
git fetch origin
- Otherwise, we need to fetch from a remote fork repo. Below
some-contributor
is the github id of the contributor, and in the Quickstep github PR, the PR is assumed to have a tag likesome-contributor:quickstep-101
git remote add some-contributor https://github.com/some-contributor/incubator-quickstep.git
git remote -v
git fetch some-contributor quickstep-101
- If the new branch is in the ASF repo, do
git checkout master
- Ensure that the PR is one commit with a well-written commit message.
- Rebase the PR with the origin master branch in the ASF repo.
- If the new branch is in the ASF repo,
git rebase -i origin/quickstep-101
- Otherwise,
git rebase -i some-contributor/quickstep-101
Now if we see "noop", we are good to merge. Otherwise, the committer should notify the PR submitter to rebase the branch to make it a single commit ahead the current master branch.
- If the new branch is in the ASF repo,
git log
If we see a commit message like "Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-quickstep
", we should abort the merge; otherwise we will mess up the master history.git push origin master
This command triggersasfgit
to merge the PR in GitHub ASF mirror repo.- Delete the branch if it is in the ASF repo, otherwise skip this step.
git push origin --delete quickstep-101
This command triggersasfgit
to delete the merged branch. - Close the JIRA ticket regarding this PR by visiting: https://issues.apache.org/jira/browse/QUICKSTEP