Versions Compared

Old Version 6

changes.mady.by.user Julia Wang

Saved on

compared with

New Version 7

changes.mady.by.user Brian Cho

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Code Block
languagebash
# Make sure we have the latest bits
$ git fetch apache
# Rebase
$ git rebase -i apache/master

 In In the rebase process, make sure that the contribution is squashed to a single commit. From the list of commits, "pick" the commit in the first line (the oldest), and "squash" the commits in the remaining lines:

Code Block
languagebash
pick 7387a49 Comment of first commit
squash 3371411 Comment of second commit
squash 9bf956d Comment of third commit

Chapter 3 and Chapter 7 of the Git Book contains lots of information on how to do thatwhat this means.

Also, please make sure that the commit message contains (in addition to the original and edited comments):

  • A link to the JIRA this is addressing.
  • The name and email of the original contributor (e.g., Contributed by John Doe <johndoe@apache.org>).
  • The test text "closes #PRNUMBER", where PRNUMBER is the number of the pull request, e.g. "10"

That latter statement is important Following the last statement will close the GitHub pull request. It is important to close via the commit message, because we cannot close pull requests via the GitHub Web UI.

...