how to 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
$ git checkout master
$ git pull origin/master
$ git merge feature
$ git push origin/master
Example 3: merge master into local branch
git checkout feature1
git merge master
Example 4: how to merge a branch to master in git
git checkout development
...
git push origin development
git checkout production
git merge development
git push origin production
git checkout development
Example 5: merge master into feature branch
git checkout feature1
git merge master