From 0c08a8b4a59754edcc8455d42d652201d25e8e1b Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Wed, 3 Jan 2024 14:26:26 +0100
Subject: [PATCH] Enable Hercules CI `flake-update`'s `baseMerge`

---
 ci/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ci/default.nix b/ci/default.nix
index 18668ba..51e6739 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -11,7 +11,10 @@
     updateBranch = "updated-flake-lock";
     createPullRequest = true;
     autoMergeMethod = null;
-    # baseMerge.enable = true;
+    baseMerge = {
+      enable = true;
+      mergeMethod = "rebase";
+    };
     when = {
       minute = 45;
       hour = 13;