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!"