Update docs.yaml

thejcannon · Aug 4, 2023 · eb1b4a6 · eb1b4a6
1 parent bdb8c63
commit eb1b4a6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -28,8 +28,8 @@ jobs:
         run: |
           git config --global user.email "joshdcannon@gmail.com"
           git config --global user.name "Joshua Cannon"
-          git config pull.rebase false
-          git pull origin jcannon/documentation
+          git fetch origin jcannon/documentation
+          git merge --allow-unrelated-histories origin/jcannon/documentation
       - name: Convert docs
         run: |
           docs/convert.sh