Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Migrated to Confluence 4.0

...

With the required number of approvals, a committer (any committer can do this including the one that committed the patch) can now make the change to the code base. Here are the recommended steps for committing:

...

  • make sure the code is up-to-date
    • git fetch
  • check out the correct branch
    • git checkout -b branch_name
  • apply the patch
    • patch -p0 < path_to_patch
  • run the tests are your machine as a final check.
  • git commit the changes. The comment should looks like "AMBARI-1234. JIRA title. (contributor via committer)"; a convention has emerged of using the committers id for brevity, but using the full names of non-committers for the contributor part
  • git pull --rebase
  • git push origin <local-branchname>:<remote-branchname>
  • resolve (make sure you "resolve" and not "close".) the jiras that correspond to the patch and put the commit message (that one that has the new revision number) in the resolution comment field.

If the Jira is a bug fix you may also need to commit the patch to the latest branch in git.