merge master into feature strategy code example

Example: merge master into feature branch

git checkout feature1
git merge master