From 5e3ea5b6e7d28fd3ee1676497b842633518fea76 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Fri, 26 Jun 2015 19:48:48 +0100 Subject: [PATCH] add update-ref master to merge-development-with-master script --- tools/merge-development-with-master.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/merge-development-with-master.sh b/tools/merge-development-with-master.sh index 84015f5133..8d2c7f0d8d 100755 --- a/tools/merge-development-with-master.sh +++ b/tools/merge-development-with-master.sh @@ -5,6 +5,7 @@ if [ "$TRAVIS_BRANCH" != "development" ]; then exit 0; fi +git update-ref HEAD master git checkout master git merge "${TRAVIS_COMMIT}" git push "https://${GH_TOKEN}@github.com/babel/babel"