Skip to content

Commit

Permalink
move ncommits check to correct place
Browse files Browse the repository at this point in the history
It's on `squash+merge me` but belongs on `merge+no rebase`. Oops!
  • Loading branch information
geekosaur authored and Mikolaj committed Nov 2, 2024
1 parent ee3c313 commit 4433a9e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,6 @@ pull_request_rules:
- label=merge delay passed
- '#approved-reviews-by>=2'
- '-label~=^blocked:'
# unlike the others, we need to force this one to be up to date
# because it's intended for when Mergify doesn't have permission
# to rebase
- '#commits-behind=0'

# merge+no rebase strategy
- actions:
Expand All @@ -101,6 +97,10 @@ pull_request_rules:
- label=merge delay passed
- '#approved-reviews-by>=2'
- '-label~=^blocked:'
# unlike the others, we need to force this one to be up to date
# because it's intended for when Mergify doesn't have permission
# to rebase
- '#commits-behind=0'

# merge strategy for release branches
- actions:
Expand Down

0 comments on commit 4433a9e

Please sign in to comment.