Git - Rebase

Your branch is one or more commits behind master and you would like to get the latest changes from master into your branch. With Git Rebase you get the latest master and put the changes in your branch on top of it.

Make sure you commit all the changes in your branch!

Get the latest master:

git checkout master
git pull origin master

Then checkout your branch and rebase your changes on master:

git checkout your-branch
git rebase master