Add existing release files before merge (#3747)

js/scripts/release.sh

@@ -35,13 +35,15 @@ git checkout -b $BRANCH
 
 echo "*** Committing compiled files for $UTCDATE"
 mv build ../build.new
+git add .
+git commit -m "$UTCDATE [update]"
 git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]"
 git rm build/*
 git commit -m "$UTCDATE [cleanup]"
 mv -f ../build.new/* build/
 rm -rf ../build.new
 git add .
-git commit -m "$UTCDATE [update]"
+git commit -m "$UTCDATE [release]"
 
 echo "*** Merging remote"
 git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG

js/scripts/test.js

@@ -1 +1 @@
-// test script 2
+// test script 3