git merge remote master into local 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: how to merge remote branch

//make sure you're on the local branch, then:

git pull origin YourRemoteBranch

//which is the same as:

git fetch origin YourRemoteBranch
git merge origin/YourRemoteBranch