merge from master to branch keep local changes code example

Example: keep local changes and pull

git stash
git pull
git stash pop