Website Summary Files Commits Branches @commit @diff @stats
diff options
context:
space:
mode:
Commitae12c0a482298e4da9b816137ceb6131c7d4b9e4 (patch)
Author
 Dimitar Trendafilov <dimitar@coherent-labs.com>
2018-09-03 21:47:27 +0300
Committer
 Dimitar Trendafilov <dimitar@coherent-labs.com>
2018-09-03 21:47:27 +0300
Files2e3aa7ad12ba14b1791be5f100795de5569c8e30
IPL-ae12c0a482298e4da9b816137ceb6131c7d4b9e4.tar
IPL-ae12c0a482298e4da9b816137ceb6131c7d4b9e4.tar.gz
IPL-ae12c0a482298e4da9b816137ceb6131c7d4b9e4.zip
Parentcb207b6df43d7661b7276c5ef6ae42cbaa4726b1 (diff)
Added a step to reduce commit conflicts when publishing
1 files changed, 6 insertions, 0 deletions
-rw-r--r--publish.sh6
diff --git a/publish.sh b/publish.sh
index 9ab2aa8..5959fe9 100644
--- a/publish.sh
+++ b/publish.sh
@@ -4,6 +4,12 @@ set -e
commit=`git log -n1 --format=%H`
+
+# Be sure that we are up-to-date
+pushd public
+git pull --ff-only
+popd
+
rm -rf public/*
hugo --minify