Versions Compared

Key

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

...

  • 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 or a statement saying "Committed to trunk and branch-x".

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