From 6331ec4b26aec838eb462bfd3d24e353f4b9bfe8 Mon Sep 17 00:00:00 2001
From: perry <perry@ionic.io>
Date: Thu, 5 May 2016 14:43:07 -0500
Subject: [PATCH] chore(CI): attempt to rebase around other commits made during
 doc/demo gen

---
 scripts/docs/deploy.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/docs/deploy.sh b/scripts/docs/deploy.sh
index fb4f501a35..b36511ac2d 100755
--- a/scripts/docs/deploy.sh
+++ b/scripts/docs/deploy.sh
@@ -44,6 +44,11 @@ function run {
   else
     git add -A
     git commit -am "Automated build of ionic  v$VERSION driftyco/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
+    # in case a different commit was pushed to ionic-site during doc/demo gen,
+    # try to rebase around it before pushing
+    git fetch
+    git rebase
+
     git push origin master
 
     echo "-- Updated docs for $VERSION_NAME succesfully!"