merge with your master and current branch code example

Example 1: merge branch to master

$ git checkout master
$ git branch new-branch
$ git checkout new-branch

# ...develop some code...

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

Example 2: merge master into local branch

git checkout feature1
git merge master