Skip to content

ci(mergify): update PRs via rebase by default instead of merge commit #35894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 2 commits into from
Oct 30, 2025
Merged

ci(mergify): update PRs via rebase by default instead of merge commit #35894

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b504f60
ci(Mergify): configuration update
aemada-aws Oct 30, 2025
e736c6e
Merge branch 'main' into mergify/aemada-aws/config-update
mergify[bot] Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ queue_rules:
- name: default-merge
# batch_size: 1 enables in-place checks (no draft PRs created for testing merges)
batch_size: 1
update_method: merge
update_method: rebase
merge_method: merge
queue_conditions:
- -title~=(WIP|wip)
Expand All @@ -33,7 +33,7 @@ queue_rules:
- name: priority-squash
# batch_size: 1 enables in-place checks (no draft PRs created for testing merges)
batch_size: 1
update_method: merge
update_method: rebase
merge_method: squash
queue_conditions:
- base!=release
Expand All @@ -58,7 +58,7 @@ queue_rules:
- name: default-squash
# batch_size: 1 enables in-place checks (no draft PRs created for testing merges)
batch_size: 1
update_method: merge
update_method: rebase
merge_method: squash
queue_conditions:
- base!=release
Expand Down
Loading