attempting to prevent errors in the even a commit to ionic-site is made during docgen

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