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;