From 22ab037b6ff61489dc2f36cc9d3a7463b6b964ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 1 Jan 2025 10:44:19 +0100 Subject: [PATCH] fix(renovate): switch automergeStrategy to auto fast-forward triggers a rebase which is not allowed in this repo. --- .renovaterc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.renovaterc.json b/.renovaterc.json index 556cabc..5d1d8db 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -4,7 +4,7 @@ "jalil" ], "automerge": true, - "automergeStrategy": "fast-forward", + "automergeStrategy": "auto", "automergeType": "pr", "commitBodyTable": true, "dependencyDashboard": true,