Skip to content

Commit 1d96d6b

Browse files
authored
ci(mergify): update PRs via rebase by default instead of merge commit (#35894)
When anyone modifies a workflow, mergify will fail to update the PR via a merge commit because of Github security which makes it look like Mergify is updating the workflows, which is disallowed without the `workflows` permission. This switches to rebase by default.
1 parent ed485cd commit 1d96d6b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.mergify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ queue_rules:
88
- name: default-merge
99
# batch_size: 1 enables in-place checks (no draft PRs created for testing merges)
1010
batch_size: 1
11-
update_method: merge
11+
update_method: rebase
1212
merge_method: merge
1313
queue_conditions:
1414
- -title~=(WIP|wip)
@@ -33,7 +33,7 @@ queue_rules:
3333
- name: priority-squash
3434
# batch_size: 1 enables in-place checks (no draft PRs created for testing merges)
3535
batch_size: 1
36-
update_method: merge
36+
update_method: rebase
3737
merge_method: squash
3838
queue_conditions:
3939
- base!=release
@@ -58,7 +58,7 @@ queue_rules:
5858
- name: default-squash
5959
# batch_size: 1 enables in-place checks (no draft PRs created for testing merges)
6060
batch_size: 1
61-
update_method: merge
61+
update_method: rebase
6262
merge_method: squash
6363
queue_conditions:
6464
- base!=release

0 commit comments

Comments
 (0)