exit 1
fi
+grep "$VERSION" package.json
+if [ $? -ne 0 ]; then
+ echo "Version in package.json doesn't match command line argument." >&2
+ exit 1
+fi
+
+grep "v$VERSION" bower.json
+if [ $? -ne 0 ]; then
+ echo "Version in bower.json doesn't match command line argument." >&2
+ exit 1
+fi
+
make lint test test-combined
if [ $? -ne 0 ]; then
echo "Tests failed. Won't release!" >&2
echo "Success!\n"
echo "Don't forget to merge changes on this branch back into master:"
-echo "git merge $branch"
+echo "git merge --no-ff $branch"
# Discourage users from working on the "releases" branch.
git checkout master