This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
set -e | |
PR=$1 | |
git checkout 3.2.x && git fetch upstream && git fetch origin && git reset --hard upstream/3.2.x && hub merge $1 && git push origin 3.2.x | |
git checkout 3.3.x && git reset --hard upstream/3.3.x && git merge --no-ff --no-edit 3.2.x && git push origin 3.3.x | |
git checkout master && git reset --hard upstream/master && git merge --no-ff --no-edit 3.3.x && git push origin master |