how to merge master into your 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 branch to master
$ git checkout master
Switched to branch 'master'
$ git merge iss53
Merge made by the 'recursive' strategy.
index.html | 1 +
1 file changed, 1 insertion(+)
Example 4: git merge master into branch
$ git checkout master
$ git pull origin/master
$ git merge feature
$ git push origin/master
Example 5: merge branch to master
$ git checkout master
$ git branch new-branch
$ git checkout new-branch
$ git add –A
$ git commit –m "Some commit message"
$ git checkout master
$ git merge new-branch
Example 6: merge master into local branch
git checkout feature1
git merge master