Merge pull request #106 from cmccandless/fix-deploy

fetch and merge origin/gh-pages before push
cmccandless · Nov 30, 2020 · e186f32 · e186f32
2 parents f8f1215 + 099aa0e
commit e186f32
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/deploy-to-pages.yml b/.github/workflows/deploy-to-pages.yml
@@ -24,7 +24,11 @@ jobs:
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "no-reply@github.com"
+
           git add index.md
           git commit -m 'Deploy to gh-pages'
           git checkout -b gh-pages
+          if git fetch origin/gh-pages; then
+            git merge origin/gh-pages
+          fi
           git push origin gh-pages:gh-pages