merge master into code example

Example 1: 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

Example 2: merge master into feature branch

git checkout feature1
git merge master