diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 745e2df67ff..791171a5458 100644 --- 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