gistfile1.md

1. in JIRA, move your ticket to "In Progress"
2. make sure your current branch is clean: git status
3. checkout the latest release: git checkout [release_branch_name]
4. pull the upstream changes on the latest release branch: git pull origin [release_branch_name]
5. create and checkout a working branch off of the release: git checkout -b [working_branch_name]
6. do your work on the branch
7. when work is finished, stage your changes: git add .
8. commit the staged changes: git commit -m 'descriptive commit message'
9. make sure your branch is clean: git status
10. if so, checkout the latest release branch: git checkout [release_branch_name]
11. pull the upstream changes on the latest release branch: git pull origin [release_branch_name]
12. checkout your working branch again: git checkout [working_branch_name]
13. rebase your working branch against the release branch: git rebase -i [release_branch_name]
14. after rebase, push your working branch upstream: git push origin [working_branch_name]
15. on Github, create a pull request to merge your working branch into the release branch
16. in JIRA, move your ticket into "In Review"
17. let someone know about the pull request and they will either reject or merge it
18. once merged, the person who merged it will update your JIRA ticket to "Merged" status