From bc941274ddc00c194f5210ee09562e60b084152d Mon Sep 17 00:00:00 2001 From: Frankie G-J Date: Mon, 18 Apr 2022 11:34:13 -0400 Subject: [PATCH] Rebase instead of squashing on auto-merge --- .github/workflows/approve-bot-prs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/approve-bot-prs.yml b/.github/workflows/approve-bot-prs.yml index 8d96e5a..1f28143 100644 --- 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 }}