Skip to content

Instantly share code, notes, and snippets.

View Derky's full-sized avatar

Derk Derky

View GitHub Profile
@marc1706
marc1706 / merge_32x_pr.sh
Last active June 17, 2019 08:04
Bash scripts for merging and pushing GitHub pull requests for phpBB
#!/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