Skip to content

Commit 1a0c1d7

Browse files
authored
renovate: Use default rebaseWhen instead of conflicted (#94)
Remove the explicit rebaseWhen=conflicted override to use Renovate's default of 'auto'. The 'conflicted' setting was causing issues where Renovate would update PR titles and descriptions to show newer available versions, but would not actually push new commits to update the branch contents. This led to confusing PRs like homebrew-bcvk#3 where the PR says 'v0.5.3 → v0.9.0' but the code only updates to v0.6.0. Assisted-by: OpenCode (Opus 4.5) Signed-off-by: Colin Walters <walters@verbum.org>
1 parent 7910dde commit 1a0c1d7

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

renovate-shared-config.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@
1515
// referenced in Cargo.toml files. Without initializing submodules, Renovate
1616
// will fail to analyze these dependencies.
1717
"cloneSubmodules": true,
18-
// Rebase when there are merge conflicts
19-
//
20-
// The "conflicted" option is typically the ideal choice for most situations
21-
// where you don't want to burn CI credits, while still keeping your branch
22-
// in a mergeable state at all times.
23-
"rebaseWhen": "conflicted",
2418
// Custom managers for detecting dependencies in non-standard files
2519
//
2620
// - Containerfile/Dockerfile: Match "# renovate:" comments with ARG statements

0 commit comments

Comments
 (0)