git merge from master to current 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 to a branch
git checkout feature1
git merge master