From 145243c64ad6c59f49be7da2a2c771b2b8ea1be7 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 25 Jul 2017 00:51:59 +0100
Subject: [PATCH] Rebase

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

diff --git a/publish.sh b/publish.sh
index c0cbd735..43598432 100755
--- a/publish.sh
+++ b/publish.sh
@@ -24,6 +24,7 @@ touch output_${SITE_ENV}/.nojekyll
 cd output_${SITE_ENV}
 mv ../.git .
 git checkout $TARGET_BRANCH || git checkout --orphan $TARGET_BRANCH
+git pull --rebase
 git add --all .
 git commit -m "Re-generate site. $SHA"
 git push $SSH_REPO $TARGET_BRANCH