$ git checkout master
$ git fetch
$ git pull
$ git merge origin/master
$ git checkout <current_branch_name>
$ git merge master <current_branch_name>