I wrote this in a page, because I have to keep searching for it.
If you made changes in a different branch, and that got pushed to master, but you need to get them back into your current working branch.
The way I usually do it.
If on Github it is normally.
git rebase origin/master
The only downside to my way is that you have to check in your current branch changes before rebasing.
The way that most people want to do it.
git checkout master
git checkout dev
git merge master
Originally published at https://shantysite.com.