Skip to content

Commit 9565640

Browse files
committed
chore: switch auto-merge type
1 parent 11b678c commit 9565640

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/update-license.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
GIT_USER: ${{secrets.AUTOMATION_USER}} <${{secrets.AUTOMATION_EMAIL}}>
5252
- name: Enable auto-merge
5353
if: steps.changes.outputs.pull-request-operation == 'created'
54-
run: gh pr merge --auto --squash "$PULL_REQUEST_URL"
54+
run: gh pr merge --auto --rebase "$PULL_REQUEST_URL"
5555
env:
5656
PULL_REQUEST_URL: ${{steps.changes.outputs.pull-request-url}}
5757
GITHUB_TOKEN: ${{secrets.AUTOMATION_TOKEN}}

.github/workflows/update-node.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
GIT_USER: ${{secrets.AUTOMATION_USER}} <${{secrets.AUTOMATION_EMAIL}}>
5050
- name: Enable auto-merge
5151
if: steps.changes.outputs.pull-request-operation == 'created'
52-
run: gh pr merge --auto --squash "$PULL_REQUEST_URL"
52+
run: gh pr merge --auto --rebase "$PULL_REQUEST_URL"
5353
env:
5454
PULL_REQUEST_URL: ${{steps.changes.outputs.pull-request-url}}
5555
GITHUB_TOKEN: ${{secrets.AUTOMATION_TOKEN}}

0 commit comments

Comments
 (0)