Git Marge Branch en maestro
git checkout master
git pull origin master
git merge test
git push origin master
|_Genos_|
git checkout master
git pull origin master
git merge test
git push origin master
git checkout main
git merge master
git push origin main
git checkout dmgr2 # gets you "on branch dmgr2"
git fetch origin # gets you up to date with origin
git merge origin/master
git checkout <branchname>
git merge master -m 'your message here'
git push origin <branchname>
# 2. merge feature branch to origin/master branch
$ git checkout master
$ git pull origin/master
$ git merge feature
$ git push origin/master
git checkout feature1
git merge master