...
Step 5: Make sure Local Master is up-to-date
git checkout master
git pull -r
Step 6: Fetch the PR into a branch named after the PR number (e.g. 2020)
git fetch origin pull/2020/head:2020
Step 7: Merge that branch into your current master
git merge 2020
Make sure that the PR to be merged has been squashed, and the comment of the commit starts with the GOBBLIN JIRA number (e.g. `[GOBBLIN-168] Standardize Github PR template for Gobblin`). Also, ensure that the JIRA references the PR in the "external_issue_url" so that the PR gets closed automatically when you merge.
Step 8: Run relevant tests
Step 9: Push local master to apache master
git push apache master
(this will get mirrored to github master)
Step 10: What happens next?
- Sub-Step A: You will noticed that the ASFGIT bot will automatically close your PR as merged
- Sub-Step B: Close the JIRA
Note : I maintain my fork in a different work space – IMHO more than 2 remotes can lead to silly mistakes.
Adding New Committers/PMC Members to the Gobblin Incubation Status Page
The goal of these instructions is to update http://incubator.apache.org/projects/gobblin.html
- Check out the svn repo at https://svn.apache.org/repos/asf/incubator/public/trunk/content/projects
- Update {local_working_dir}/content/projects/gobblin.xml
- svn commit -m "Adding xxx as committer/pmc member to apache gobblin"
- Publish to the incubator website using https://cms.apache.org/incubator/publish
- Verify your change on http://incubator.apache.org/projects/gobblin.html
References for Committers
- Git at Apache: https://git-wip-us.apache.org/