git pull

git pull = git fetch + git merge

# merge the local & remote changes locally
git pull

# use remote branch as base, add changes on top of it
git pull --rebase