From cbd5fe7c0745c55e4c4612d41b17e0a1fc10ebdc Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Thu, 8 Dec 2016 14:48:09 +0100
Subject: [PATCH] Update with -X only for merge (#3745)

---
 js/scripts/release.sh | 4 ++--
 js/scripts/test.js    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 js/scripts/test.js

diff --git a/js/scripts/release.sh b/js/scripts/release.sh
index ee2f6e0a6..fa62cd249 100755
--- a/js/scripts/release.sh
+++ b/js/scripts/release.sh
@@ -35,9 +35,9 @@ git checkout -b $BRANCH
 
 echo "*** Committing compiled files for $UTCDATE"
 mv build ../build.new
-git pull origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]"
+git pull origin/$BRANCH --commit --no-edit -X ours
 git rm build/*
-git commit -m "$UTCDATE [rm]"
+git commit -m "$UTCDATE [rm old]"
 mv -f ../build.new/* build/
 rm -rf ../build.new
 git add .
diff --git a/js/scripts/test.js b/js/scripts/test.js
new file mode 100644
index 000000000..d29038fa8
--- /dev/null
+++ b/js/scripts/test.js
@@ -0,0 +1 @@
+// test script