fusionar el maestro en la rama Feauture
git checkout feature1
git merge master
Victorious Vulture
git checkout feature1
git merge master