From 5d224df2d5ece5632b4b813d0d667fa67a63cdb6 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 8 Dec 2016 15:02:45 +0100 Subject: [PATCH] Release script back to using fetch/merge (#3746) * Update with -X only for merge * Release back to using fetch/merge --- js/scripts/release.sh | 6 +++--- js/scripts/test.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/scripts/release.sh b/js/scripts/release.sh index fa62cd249..ff09a5ba8 100755 --- a/js/scripts/release.sh +++ b/js/scripts/release.sh @@ -35,13 +35,13 @@ git checkout -b $BRANCH echo "*** Committing compiled files for $UTCDATE" mv build ../build.new -git pull origin/$BRANCH --commit --no-edit -X ours +git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]" git rm build/* -git commit -m "$UTCDATE [rm old]" +git commit -m "$UTCDATE [cleanup]" mv -f ../build.new/* build/ rm -rf ../build.new git add . -git commit -m "$UTCDATE" +git commit -m "$UTCDATE [update]" echo "*** Merging remote" git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG diff --git a/js/scripts/test.js b/js/scripts/test.js index d29038fa8..829d1f8c3 100644 --- a/js/scripts/test.js +++ b/js/scripts/test.js @@ -1 +1 @@ -// test script +// test script 2