how to merge master with local 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 with main
git checkout master
git pull origin master
git merge test
git push origin master
Example 3: git merge master into branch
$ git checkout master
$ git pull origin/master
$ git merge feature
$ git push origin/master
Example 4: merge master into local branch
git checkout feature1
git merge master