merge master branch with local code example

Example: merge master into local branch

git checkout feature1
git merge master