how to merge master to local branch code example
Example 1: merge master to dev branch
1. //pull the latest changes of current development branch if any
git pull (current development branch)
2. //switch to master branch
git checkout master
3. //pull all the changes if any
git pull
4. //Now merge development into master
git merge development
5. //push the master branch
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