how to merge master into main code example
Example 1: merge master with main
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 master into local branch
git checkout feature1
git merge master
Example 4: merge master into feature branch
git checkout feature1
git merge master