how to merge master updates into sub branch code example
Example 1: merge master into local branch
git checkout feature1
git merge masterExample 2: merge master into feature branch
git checkout feature1
git merge mastergit checkout feature1
git merge mastergit checkout feature1
git merge master