Remove rebase in git pull

Author: adriaandotcom

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   schedule:
     - cron: "0 8 * * 1" # At 08:00 on Monday.
-  workflow_dispatch:
+  workflow_dispatch: # Allows manual triggering
 
 jobs:
   update:
@@ -14,6 +14,9 @@ jobs:
     steps:
       - name: Check out repository
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0       # Fetch all history so we can access tags and commits
+          fetch-tags: true     # Ensure tags are fetched
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
@@ -61,10 +64,10 @@ jobs:
         run: |
           git config user.name "GitHub Actions"
           git config user.email "[email protected]"
-          git pull --rebase
           git add .
           git commit -m "${{ steps.script.outputs.release-name }}"
-          git push
+          # Push changes, handling potential conflicts
+          git push || git pull --rebase origin ${{ github.ref_name }} && git push
 
       - name: Create release
         id: release