merge master with main
git checkout master
git pull origin master
git merge test
git push origin mastermerge master with main
git checkout master
git pull origin master
git merge test
git push origin mastergit 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/mastermerge master into local branch
git checkout feature1
git merge mastermerge master into branch
git checkout master
git pull
git checkout test
git merge master
git pushmerge branch into master
# ...develop some code...
$ git add –A
$ git commit –m "Some commit message"
$ git checkout master
Switched to branch 'master'
$ git merge new-branchCopyright © 2021 Codeinu
Forgot your account's password or having trouble logging into your Account? Don't worry, we'll help you to get back your account. Enter your email address and we'll send you a recovery link to reset your password. If you are experiencing problems resetting your password contact us
