merg branch with master 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: git merge two branches
git checkout targetBranch
git merge sourceBranch