merge from master 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: merge master into branch

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