how to merge master with branch code example
Example 1: how to merge git branch to master
git checkout master
git pull origin master
git merge test
git push origin master
Example 2: 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