Versions Compared

Key

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

...

Once you are happy with the changes in a pull request and are ready to merge it, you need to: checkout the PR branch (see above), rebase on the current master, and push it to the official Apache git repository.
In this example, I assume the change is a code change applied to master. For documentation changes the process is the same but applied to the gh-pages branch. Additionally, you need to publish the website as described in Publish Website.

...

First, fetch the PR as explained above. Make sure your master is up to date, then rebase the PR branch on master if needed.

git rebase apache/master

At this point double check that the commit messages are in the proper format and that the PR contains no merge commits to keep linear git history.

...