how to merge a master to its 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
git checkout feature1
git merge master
git checkout feature1
git merge master