From df0acebd133ab8911f628a7ef5446965c3923ce5 Mon Sep 17 00:00:00 2001 From: Ismail Kharrobi Date: Sat, 16 Sep 2023 00:14:47 +0100 Subject: [PATCH 1/2] REMOVE:squash merge | potential sync problems --- .github/workflows/automerge.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yaml b/.github/workflows/automerge.yaml index 68fd222..1d66211 100644 --- a/.github/workflows/automerge.yaml +++ b/.github/workflows/automerge.yaml @@ -64,7 +64,7 @@ jobs: - name: merge run: | - gh pr merge --auto --squash "$PR_URL" + gh pr merge --auto "$PR_URL" env: GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }} PR_URL: ${{ github.event.pull_request.html_url }} From 3abe6d7eeea45028f9520efb070b77e65ed434ba Mon Sep 17 00:00:00 2001 From: Ismail Kharrobi Date: Sat, 16 Sep 2023 01:03:01 +0100 Subject: [PATCH 2/2] Update automerge.yaml --- .github/workflows/automerge.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yaml b/.github/workflows/automerge.yaml index 1d66211..d6fb577 100644 --- a/.github/workflows/automerge.yaml +++ b/.github/workflows/automerge.yaml @@ -64,7 +64,7 @@ jobs: - name: merge run: | - gh pr merge --auto "$PR_URL" + gh pr merge --auto --merge "$PR_URL" env: GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }} PR_URL: ${{ github.event.pull_request.html_url }}