git merge branch master into 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: git merge master into branch

# 2. merge feature branch to origin/master branch
$ git checkout master
$ git pull origin/master

$ git merge feature
$ git push origin/master

Example 3: merge master into feature branch

git checkout feature1
git merge master