chore: release PRs use exact commits and linear history

ipfs · Nov 5, 2024 · 5b47adf · 5b47adf
1 parent 1306349
commit 5b47adf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/auto-release-pr.yml b/.github/workflows/auto-release-pr.yml
@@ -21,8 +21,8 @@ jobs:
           ref: production
       - name: Create PR from staging to production
         run: |
-          git fetch origin main:main
-          git reset --hard main
+          git fetch origin staging:staging
+          git merge --ff-only staging
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
         with:
@@ -40,7 +40,7 @@ jobs:
       - name: Create PR from main to staging
         run: |
           git fetch origin main:main
-          git reset --hard main
+          git merge --ff-only main
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
         with: