"Even if you’re a single developer with only a few branches, it’s worth it to get in the habit of using rebase and merge properly. The basic work pattern will look like:
Create new branch B from existing branch A
Add/commit changes on branch B
Rebase updates from branch A
Merge changes from branch B onto branch A"
http://gitguru.com/2009/02/03/rebase-v-merge-in-git/https://www.atlassian.com/git/tutorials/merging-vs-rebasing/