git_workflow.txt

My Git Workflow starting from master and doing development in a feature branch.

1) git checkout -b new_feature_name
2) make changes
3) git add .
4) git commit -m "message"
5) repeat 2-4 until you're happy with your progress
6) (optional) git rebase --interactive (if you want to cleanup the commit history prior to merge)
7) git checkout master
8) git pull
9) if master was already up-to-date skip to 13
10) git checkout new_feature_name
11) git rebase master (resolve any issues)
12) git checkout master
13) git merge new_feature_name