From 2f0d0c94ef8438090f9f8ad5989389c123ed4b08 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Fri, 26 Jun 2015 20:30:16 +0100 Subject: [PATCH] try alternate merge parameter --- tools/merge-development-with-master.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/merge-development-with-master.sh b/tools/merge-development-with-master.sh index 8d2c7f0d8d..15d3bcb39b 100755 --- a/tools/merge-development-with-master.sh +++ b/tools/merge-development-with-master.sh @@ -7,5 +7,5 @@ fi git update-ref HEAD master git checkout master -git merge "${TRAVIS_COMMIT}" +git merge $TRAVIS_COMMIT git push "https://${GH_TOKEN}@github.com/babel/babel"