Skip to content

ci(mergify): upgrade configuration to current format #141

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

Open
mergify wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ci(mergify): upgrade configuration to current format #141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ merge_queue:

queue_rules:
- name: single-commit
autoqueue: true
batch_size: 1
merge_method: rebase
queue_conditions: &single_commit_conditions
Expand All @@ -44,7 +43,6 @@ queue_rules:
merge_conditions: *single_commit_conditions

- name: multi-commit
autoqueue: true
batch_size: 1
merge_method: squash
queue_conditions: &multi_commit_conditions
Expand Down Expand Up @@ -77,3 +75,6 @@ pull_request_rules:
actions:
comment:
message: "@{{author}} This pull request has conflicts with the target branch. Please resolve them and update the branch before merging."
merge_protections_settings:
auto_merge_conditions: true
reporting_method: check-runs
Loading