More robust reset

kdeldycke · Mar 4, 2024 · 74141aa · 74141aa
1 parent 6c92efd
commit 74141aa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -85,9 +85,9 @@ jobs:
       - name: Combine the last 2 commits into one
         # See: https://stackoverflow.com/a/26172014
         run: |
-          git reset --soft HEAD~2
-          git commit --message "${{ env.PR_COMMIT_MSG }}"
+          git reset --soft $(git merge-base main HEAD)
 
       - name: Push new commit history to PR
         run: |
+          git commit --message "${{ env.PR_COMMIT_MSG }}"
           git push --force