merge master into my 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

Example 3: merge branch into master

# ...develop some code...

$ git add –A
$ git commit –m "Some commit message"
$ git checkout master
Switched to branch 'master'
$ git merge new-branch

Example 4: merge master into feature branch

git checkout feature1
git merge master