Merge flow

merge2master.sh

#Find differences
git diff --stat --color GS-1702-migrate-bo-server-to-php-55..master 

#Merge master
#git checkout [branch]
git merge --no-commit --no-ff master 
git commit -am"merge master" 
git push 

#Merge brange
#git checkout master
git merge --no-commit --no-ff GS-1702-migrate-bo-server-to-php-55
git commit -am"merge GS-1702-migrate-bo-server-to-php-55" 
git push 

#Create tag
git tag -a v1.25.00-WITHOUT-PHP55 -m 'version 1.25.00' && git push origin v1.25.00-WITHOUT-PHP55

#Delete tag
#git tag -d v1.25.00-RC1 && git push rigin :refs/tags/v1.25.00-RC1