I switch to master after develop on a branch for a long time. The log shows:
Your branch is behind 'origin/master' by 167 commits, and can be fast-forwarded.
git checkout HEAD
git checkout master git pull origin
will fetch and merge the
origin/master branch (you may just say
git pull as origin is the default).