SHELL

git merge master into branch

git checkout [branchname]
git merge master
git push origin [branchname]

git merge master to branch

git checkout <branchname>
git merge master -m 'your message here'
git push origin <branchname>

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

merge master into local branch

git checkout feature1
git merge master