From 211c42dd4d65b3e7a07428fc341a2a0ae13a5a51 Mon Sep 17 00:00:00 2001 From: Josh Cannon Date: Fri, 4 Aug 2023 10:37:31 -0500 Subject: [PATCH] Update docs.yaml --- .github/workflows/docs.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 791171a5458..f07db24da28 100644 --- 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