Update docs.yaml

thejcannon · Aug 4, 2023 · 211c42d · 211c42d
1 parent eb1b4a6
commit 211c42d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -24,12 +24,15 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: main
+      - name: Check out code
+        uses: actions/checkout@v3
+        with:
+          ref: jcannon/documentation
       - name: Merge docs branch
         run: |
           git config --global user.email "joshdcannon@gmail.com"
           git config --global user.name "Joshua Cannon"
-          git fetch origin jcannon/documentation
-          git merge --allow-unrelated-histories origin/jcannon/documentation
+          git merge main
       - name: Convert docs
         run: |
           docs/convert.sh