#!/bin/bash
# Merge master to gh-pages, rebuild the prod cljs, and push.

set -e

git checkout gh-pages
git rebase master
rm resources/public/cljs/main.js
lein cljsbuild once prod
git add -f resources/public/cljs/main.js
git commit -m "Update gh-pages js"
git push

#!/bin/bash
# Merge master to gh-pages, rebuild the prod cljs, and push.

set -e

git checkout gh-pages
git merge master
rm resources/public/cljs/main.js
lein cljsbuild once prod
git add -f resources/public/cljs/main.js
git commit -m "Update gh-pages js"
git push

Revert "rebase instead of merge"
Revert "rebase instead of merge"

This reverts commit df52a7a6aff93b6c050f2841f433c7ccbbb60248.

because that has caused problems
