Skip to content

Commit

Permalink
Use rebases instead of merge commits
Browse files Browse the repository at this point in the history
Per haskell#10048 (comment)
ff.

In studying the Mergify documentation, I discovered the actual rules are
slightly different than the ones we thought it was using, so I used the
ones the documentation cited (cf.
https://docs.mergify.com/workflow/actions/merge/#parameters).
  • Loading branch information
geekosaur committed May 23, 2024
1 parent 50d9f9c commit 6f8bc1b
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 @@ -19,8 +19,8 @@ pull_request_rules:
- actions:
queue:
name: default
# Merge into master with a merge commit
method: merge
# Merge into master with a rebase
method: rebase
# Update the pr branch with rebase, so the history is clean
update_method: rebase
name: Put pull requests in the rebase+merge queue
Expand Down Expand Up @@ -60,8 +60,8 @@ pull_request_rules:
- actions:
queue:
name: default
# Merge with a merge commit
method: merge
# Merge with a rebase
method: rebase
# Update the pr branch with rebase, so the history is clean
update_method: rebase
name: Put backports in the rebase+merge queue
Expand Down

0 comments on commit 6f8bc1b

Please sign in to comment.