From ae12c0a482298e4da9b816137ceb6131c7d4b9e4 Mon Sep 17 00:00:00 2001
From: Dimitar Trendafilov <dimitar@coherent-labs.com>
Date: Mon, 3 Sep 2018 21:47:27 +0300
Subject: Added a step to reduce commit conflicts when publishing

---
 publish.sh | 6 ++++++
 1 file changed, 6 insertions(+)

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
-- 
cgit v1.3.1-26-gb76a