File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change 51
51
GIT_USER : ${{secrets.AUTOMATION_USER}} <${{secrets.AUTOMATION_EMAIL}}>
52
52
- name : Enable auto-merge
53
53
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"
55
55
env :
56
56
PULL_REQUEST_URL : ${{steps.changes.outputs.pull-request-url}}
57
57
GITHUB_TOKEN : ${{secrets.AUTOMATION_TOKEN}}
Original file line number Diff line number Diff line change 49
49
GIT_USER : ${{secrets.AUTOMATION_USER}} <${{secrets.AUTOMATION_EMAIL}}>
50
50
- name : Enable auto-merge
51
51
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"
53
53
env :
54
54
PULL_REQUEST_URL : ${{steps.changes.outputs.pull-request-url}}
55
55
GITHUB_TOKEN : ${{secrets.AUTOMATION_TOKEN}}
You can’t perform that action at this time.
0 commit comments