From 3a80434a1cf6803ae78d80f196bc49d6247f8c10 Mon Sep 17 00:00:00 2001
From: perry <perry@ionic.io>
Date: Thu, 5 May 2016 14:50:40 -0500
Subject: [PATCH] attempting to prevent errors in the even a commit to
 ionic-site is made during docgen

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

diff --git a/scripts/docs/update_docs.sh b/scripts/docs/update_docs.sh
index 413b3a0f..c1c58dfc 100755
--- a/scripts/docs/update_docs.sh
+++ b/scripts/docs/update_docs.sh
@@ -32,6 +32,11 @@ function run {
   else
     git add -A
     git commit -am "Automated build of native docs 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!"