From 8f659ef4f7d190e1dca5c03ffeabcbc5c5d7bb35 Mon Sep 17 00:00:00 2001 From: pat-s Date: Sun, 18 Oct 2026 01:14:22 +0000 Subject: [PATCH] fix(renovate): automerge with squash to match the repo's merge settings (#237) Renovate automerge fails in this repo. The shared preset uses `automergeStrategy: fast-forward`, but devxy/build-cran-binaries only allows squash merges, so Forgejo answers every merge call with `405 Method Not Allowed`. This overrides the strategy to `squash` for this repo only, so eligible minor/patch/digest PRs merge again in the automerge window. Same fix as devxy/k8s-talos#419. Reviewed-on: https://git.devxy.io/devxy/build-cran-binaries/pulls/237 --- renovate.json | 1 + 1 file changed, 1 insertion(+) diff --git a/renovate.json b/renovate.json index 7b2c3b3..3723172 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": ["local>devxy/renovate-config"], + "automergeStrategy": "squash", "ignorePaths": [ "docker/**", ".crow/process-updates.yaml",