rebase instead of squash on auto-merge

paketo-buildpacks · Apr 18, 2022 · 2247967 · 2247967
1 parent fe74309
commit 2247967
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/approve-bot-prs.yml b/.github/workflows/approve-bot-prs.yml
@@ -64,6 +64,6 @@ jobs:
     - name: Enable Auto-Merge
       if: steps.human-commits.outputs.human_commits == 'false' && steps.unverified-commits.outputs.unverified_commits == 'false'
       run: |
-        gh pr merge ${{ needs.download.outputs.pr-number }} --auto --squash
+        gh pr merge ${{ needs.download.outputs.pr-number }} --auto --rebase
       env:
         GITHUB_TOKEN: ${{ secrets.PAKETO_BOT_GITHUB_TOKEN }}