THIS IS A TEST INSTANCE. ALL YOUR CHANGES WILL BE LOST!!!!
...
- Check the pull request status on github, at the bottom of the pull request page. It will tell you if there are any merge conflicts with master branch.
- If there are conflicts, either ask the contributor to merge up, or be prepared to resolve the conflicts yourself.
- Create a local merge branch, based on the latest, greatest.
- git fetch apache (if ssh is not setup you will be prompted for your apache password)
- git checkout -b mrg_12345 apache/master
- Fetch pull request branch to default destination FETCH_HEAD
- git fetch origin +refs/pull/12345/head
- Merge locally, giving message that includes JIRA IDNormally, you want to just merge their branch:
- git merge --no-ff -m "Merge [TRAFODION-XYZ] PR-12345 Whizbang feature" FETCH_HEAD
- Sometimes you might want to squash their branch into a single commit. If so, add the "--squash" option.
- If you forget the -m option, you end up with a less than helpful default comment.
Before you push the commit, you can fix the comment by:- git commit --amend
- Additional checks of what you are preparing to push
- git log apache/master..HEAD
- git diff apache/master HEAD
- Push changes to Apache repo, specifying the source and the destination branch.
- git push apache HEAD:master (if ssh is not setup you will be prompted for your apache password)
...