Skip to content

Commit

Permalink
Mergify: add no-rebase rule
Browse files Browse the repository at this point in the history
If a pull request gets the "merge+no rebase" label, it' will be merged directly to master without a rebase/squash or queue. This can be useful in cases when contributors don't allow updating their branches.
  • Loading branch information
ulysses4ever committed Jul 18, 2023
1 parent 20c480a commit 6af0c08
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ pull_request_rules:
- or:
- label=merge me
- label=squash+merge me
- label=merge+no rebase
- '#approved-reviews-by>=2'

# rebase+merge strategy
Expand Down Expand Up @@ -44,6 +45,17 @@ pull_request_rules:
- label=merge delay passed
- '#approved-reviews-by>=2'

# merge+no rebase strategy
- actions:
merge:
method: merge
name: Merge "merge+no rebase" pull requests directly (without a queue)
conditions:
- base=master
- label=merge+no rebase
- label=merge delay passed
- '#approved-reviews-by>=2'

# rebase+merge strategy for backports: require 1 approver instead of 2
- actions:
queue:
Expand Down

0 comments on commit 6af0c08

Please sign in to comment.