From 0c5bc02e542f5b0607efbf42960c7707513c1423 Mon Sep 17 00:00:00 2001 From: brandon s allbery kf8nh Date: Thu, 23 May 2024 18:02:55 -0400 Subject: [PATCH] Use rebases instead of merge commits Per https://github.com/haskell/cabal/pull/10048#issuecomment-2127952944 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). --- .github/mergify.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 4a1efe926a8..7e4a6e0b06f 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -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 @@ -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