I had to make sure my git branch is updated with my master.
So at my master branch
git pull master
Next, I switched to my branch named ‘feature_super_tag’.
git checkout feature_super_tag
and then
git rebase master
A good explanation of what a rebase does is from these two blogs:
http://jbowes.dangerouslyinc.com/2007/01/26/git-rebase-keeping-your-branches-current/
http://adam.blog.heroku.com/past/2008/6/30/rebasing_is_editing_commits/
Note: It’s a good policy to never work in your master. Make a branch first for any changes you want to do.
