来自SO顶得最多的答案：http://stackoverflow.com/questions/4556467/git-pull-or-git-merge-between-master-and-development-branches
This workflow works best for me:
git checkout -b develop...make some changes...
...notice master has been updated...
...commit changes to develop...
git checkout master
git pull...bring those changes back into develop...
git checkout develop
git rebase master...make some more changes...
...commit them to develop...
...merge them into master...
git checkout master
git pull
git merge develop
