Versions Compared

Key

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

...

5. Push the change back to Apache. Pick one of the following:
You should almost always collapse your work into a single check-in in order to avoid cluttering the upstream change-log:

Code Block
# Assuming trunk is up-to-date with origin
git checkout master
git merge --squash xyz
git commit -am "KNOX-nnn xyz feature; reviewed by <reviewers>"
git push origin master

...