Page History

...

1. Make sure you have the latest changes
   • git fetch --all
2. Base your branch on the latest master
   • git checkout -b MyBranch origin/master

Make Changes

• Edit, Build, Test, Repeat
• You may make multiple local commits as desired. Unlike the

...

• Gerrit tool, you do not need to keep your changes in a single commit.
• Depending on how long you work on the changes you may want to rebase your branch, using git rebase.
• Prior to pushing your changes to github, you may use git commands that alter your branch history:
  • commit --amend, rebase, merge --squash

Push Changes to your GitHub Fork

1. Push the branch to your github repo, specifying the branch (or HEAD) to push. The remote is named the same as your github user ID (created earlier by "hub fork" or "git remote add...").
   1. git push -n GHuser HEAD           ## dry-run option to check
   2. git push GHuser  MyBranch
2. Once you publish your changes in this way, you should not subsequently use git commands that alter your branch history:
   • commit --amend, rebase, merge --squash

Create a Pull Request

1. Request your branch to be pulled to apache/incubator-trafodion
   • hub pull-request
2. Be sure to include the JIRA ID in brackets at the beginning of the title of your pull request (PR). This allows all activity on the PR to be mirrored to Jira.
   • [TRAFODION-12345] Cool Feature Xyz
3. Automated tests are normally triggered to run on every pull request. If you are modifying something that will not affect testing, you can add a phrase to the comments of the pull request:
   • jenkins, skip test

Update your Pull Request

1. Follow the github conversation on your pull request and respond to questions and issues. You should be automatically subscribed to your own pull requests.
   • To make additional changes, go to your local working branch and make additional commits. Do NOT use --amend.
   • git checkout MyBranch ;

...

1. • <edits, etc> ; git commit
2. Push the branch to your github fork. These changes automatically show up in the pull-request.
   • git push GHuser  MyBranch

Related articles

...