to merge master and branch code example

Example 1: merge master into local branch

git checkout feature1
git merge master

Example 2: merge master into feature branch

git checkout feature1
git merge master