SHELL

merge master into branch

git checkout master
git pull
git checkout test
git merge master
git push

merge branch into master

# ...develop some code...

$ git add –A
$ git commit –m "Some commit message"
$ git checkout master
Switched to branch 'master'
$ git merge new-branch

merge master into feature branch

git checkout feature1
git merge master