merge master to feature code example
Example 1: merge master with main
git checkout master
git pull origin master
git merge test
git push origin master
Example 2: merge master into feature branch
git checkout feature1
git merge master
git checkout master
git pull origin master
git merge test
git push origin master
git checkout feature1
git merge master