Variante 1
git checkout production
git merge feature-branch
get reset origin/production
git add --all
git commit -m "[#1234] Schöner name"
git push
b cap production deploy:migrations
git checkout master
git merge production
git push
Variante 2
feature branch in den master bringen wie bisher
git checkout production
git cherry-pick 1433542342435
git push
b cap production deploy:migrations
git checkout master
git merge production
git push
Posted by Julian Hauck to Distribusion IT (2013-08-16 12:00)