fusionar el maestro con el principal
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# 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 push