Skip to content
Merged
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# to dedup some of the check-x=y repetition in the future.
queue_rules:
- name: default
conditions:
queue_conditions:
- check-success=check
- check-success=build
- check-success=podmanbuild
Expand Down Expand Up @@ -71,8 +71,9 @@ pull_request_rules:
- conflict
actions:
comment:
message: "This pull request now has conflicts with the target branch.
Please resolve these conflicts and force push the updated branch."
message:
"This pull request now has conflicts with the target branch.
Please resolve these conflicts and force push the updated branch."
# Label PRs that have been sitting there unchanged, aging like a fine wine
#
# NOTE: the updated-at "counter" resets every time the PR is changed so
Expand All @@ -89,3 +90,6 @@ pull_request_rules:
label:
add:
- "priority-review"

merge_queue:
max_parallel_checks: 1
Loading