diff --git a/renovate.json b/renovate.json index 2bb7ce2b9..6e927948e 100644 --- a/renovate.json +++ b/renovate.json @@ -7,6 +7,7 @@ ":semanticCommits", ":semanticCommitScope(deps)" ], + "rebaseWhen": "conflicted", "packageRules": [ { "matchPackagePatterns": [