diff --git a/renovate.json b/renovate.json index 9b78258fa..faef7dc67 100644 --- a/renovate.json +++ b/renovate.json @@ -19,8 +19,7 @@ "addLabels": [ "chart" ], - "automerge": false, - "minimumReleaseAge": "1 days" + "automerge": false }, { "description": "Automerge chart patches", @@ -34,7 +33,8 @@ "chart" ], "automerge": true, - "automergeType": "branch", + "automergeType": "pr", + "automergeStrategy": "rebase", "internalChecksAsSuccess": true, "internalChecksFilter": "flexible", "minimumReleaseAge": "1 days" @@ -47,8 +47,7 @@ "addLabels": [ "image" ], - "automerge": false, - "minimumReleaseAge": "1 days" + "automerge": false }, { "description": "Automerge image patches", @@ -63,7 +62,8 @@ "image" ], "automerge": true, - "automergeType": "branch", + "automergeType": "pr", + "automergeStrategy": "rebase", "internalChecksAsSuccess": true, "internalChecksFilter": "flexible", "minimumReleaseAge": "1 days"