git flow

git_workflow.txt

step 1
change things on your branch,
commit them with a sensible name on your branch.

step 2
switch to master,
pull from origin, merge where needed.

step 3
switch to your branch
merge master into your branch
merge where needed

step 4
switch to master
pull from origin just in case (if theres new stuff jump back to step 3)

step 5
merge your branch into master
push to origin

go back to step 1!