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 mastergit 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
git checkout master
git pull
git checkout test
git merge master
git pushgit checkout <feature-branch>
git pull
git checkout <release-branch>
git pull
git merge --no-ff <feature-branch>
git push
git tag -a branch-<feature-branch> -m "Merge <feature-branch> into <release-branch>"
git push --tags
git branch -d <feature-branch>
git push origin :<feature-branch>