git merge master into my branch code example

Example 1: git merge origin/master into branch

git checkout dmgr2      # gets you "on branch dmgr2"
git fetch origin        # gets you up to date with origin
git merge origin/master

Example 2: merge master into feature branch

git checkout feature1
git merge master

Example 3: merge master to a branch

git checkout feature1
git merge master