chore: Only rebase renovate PRs when theres a conflict

niallthomson · web-flow · commit 0fe3791a1ede · 2025-08-21T05:58:33.000-06:00
diff --git a/renovate.json b/renovate.json
@@ -2,6 +2,7 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["config:recommended", ":automergeStableNonMajor"],
   "enabledManagers": ["github-actions", "terraform", "npm", "maven", "gomod"],
+  "rebaseWhen": "conflicted",
   "packageRules": [
     {
       "matchManagers": ["github-actions"],

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`"$schema": "https://docs.renovatebot.com/renovate-schema.json",`
`3`	`3`	`"extends": ["config:recommended", ":automergeStableNonMajor"],`
`4`	`4`	`"enabledManagers": ["github-actions", "terraform", "npm", "maven", "gomod"],`
	`5`	`+ "rebaseWhen": "conflicted",`
`5`	`6`	`"packageRules": [`
`6`	`7`	`{`
`7`	`8`	`"matchManagers": ["github-actions"],`