From 9898c0c8abce897f7c5133c35a4f713fb482561d Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Fri, 24 Jul 2015 19:59:53 +0300 Subject: [PATCH] forget to update from master - fix this --- demo.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demo.sh b/demo.sh index 9f3135f6..763d06a9 100644 --- a/demo.sh +++ b/demo.sh @@ -4,6 +4,7 @@ set -o errexit # Exit on error git stash save git checkout gh-pages +git pull --rebase origin master cd examples/todomvc webpack git add . @@ -14,4 +15,4 @@ if git push --force; then # Commit the changes, if any fi fi git checkout master -git stash apply \ No newline at end of file +git stash apply