git merge code from master keep local changes code example

Example: how to pull the changes from git without staging local changes

git stash save
git pull
git stash pop