git merge origin/master
should work. Since master
is usually a tracking branch, you could also do git pull
from that branch and it will do a fetch & merge for you.
If you have local changes on your master
that aren't reflected on origin
, you might want git rebase origin/master
to make sure your commits are 'on top'.