Home

git checkout [branch we will be copying]
git pull origin [branch we will be copying] This grabs the branch from the github repository. Change the name to w/e branch working with. Alternatively, there's a way to pull the changes check if you like them & then accept them - Link
git checkout -b [name_of_your_new_branch] The name should be something related to what you're fixing like controller/view/model name or controller#action & toss the date on there in this format MMDDYY (month/day/year) - so we know at a glance (without clicking around when it's from)
git add [path/filename] preferred or git add -A ... if lazy :(
git commit -m "done finishing x" It's helpful to list why you are changing things in summary, as if someone is curious we can always see what you changed with a few clicks.
git push
git checkout [branch we originally started on]
git merge [name_of_your_new_branch]

Provide feedback