From c76fda451175f864930b72c33fe8b5d1afc11b61 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Fri, 5 Jan 2024 12:36:38 +0100
Subject: [PATCH] Automatic `update-flake` merge

---
 ci/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ci/default.nix b/ci/default.nix
index 78a988f..c1fe86b 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -1,4 +1,4 @@
-{inputs, config, ...}: {
+{inputs, ...}: {
   imports = [
     inputs.hercules-ci-effects.flakeModule
   ];
@@ -10,7 +10,11 @@
     enable = true;
     updateBranch = "updated-flake-lock";
     createPullRequest = true;
-    autoMergeMethod = null;
+    autoMergeMethod = "rebase";
+    baseMerge = {
+      enable = true;
+      method = "rebase";
+    };
     when = {
       minute = 30;
       hour = 13;