git checkout my_branch # move on your branch (make sure it exists)
git fetch origin # fetch all changes
git pull origin master # pull changes from the origin remote, master branch and merge them into my_branch
git push origin my_branch # push my_branch
git pull origin my_remote_branch
git pull . master