SHELL

how to merge git branch to master

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

git merge master to branch

git checkout <branchname>
git merge master -m 'your message here'
git push origin <branchname>