2 ways

first one:

1. git fetch
   1. Action: download the changes
2. git merge origin/master
   1. Fast forward

second one:

1. git pull
2. git pull origin master
   1. in case of un-committed changes in directory:
      1. either commit or use ~git stash push/pop
      2. in case of editing the same code: Merge conflict