Skip to content

Commit

Permalink
Deps: rebase Renovate PRs when conflicted (#637)
Browse files Browse the repository at this point in the history
  • Loading branch information
emmercm authored Aug 28, 2023
1 parent 73f54d3 commit a0e246f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
platformAutomerge: true, // default
// Rely on the PR Rebaser GitHub Action to do this. PRs will merge in the order they are created,
// so the `prPriority` option SHOULD be respected.
rebaseWhen: 'never',
rebaseWhen: 'conflicted', // separate PRs updating the lockfile are likely to conflict each other

packageRules: [
{
Expand Down

0 comments on commit a0e246f

Please sign in to comment.