diff options
| author | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-08-27 16:26:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-27 16:26:54 +0000 |
| commit | 1bf1b9cc9b55fde85d44a22f829cf09f41a974ab (patch) | |
| tree | feb30fce2c8f5cdba62210d726a7f3ad2ab7035b /.mergify/config.yml | |
| parent | 911a62f1327a7a689e3d061efc4e62508521d48d (diff) | |
| parent | b2a431868c4ae0ad99def0a504d2fe097e16cd4f (diff) | |
| download | edk2-dependabot/github_actions/github/issue-labeler-3.4.tar.gz | |
Merge branch 'master' into dependabot/github_actions/github/issue-labeler-3.4dependabot/github_actions/github/issue-labeler-3.4
Diffstat (limited to '.mergify/config.yml')
| -rw-r--r-- | .mergify/config.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.mergify/config.yml b/.mergify/config.yml index 3471896a34..fd77b1707b 100644 --- a/.mergify/config.yml +++ b/.mergify/config.yml @@ -26,9 +26,10 @@ queue_rules:
- name: default
- conditions:
+ queue_conditions:
- base~=(^main|^master|^stable/)
- label=push
+ merge_method: rebase
pull_request_rules:
- name: Automatically merge a PR when all required checks pass and 'push' label is present
@@ -37,7 +38,6 @@ pull_request_rules: - label=push
actions:
queue:
- method: rebase
name: default
- name: Post a comment on a PR that can not be merged due to a merge conflict
|