Skip to content

Commit

Permalink
renovate: stop rebasing PRs automatically
Browse files Browse the repository at this point in the history
This is not really helpful, as it makes it impossible to merge many PRs
in a row. The risk of conflicts is rather low IMO so we should not
require this by default. We can still rebase manually via the button if
needed.

Signed-off-by: Paul Holzinger <[email protected]>
  • Loading branch information
Luap99 committed Apr 16, 2024
1 parent 3ca4655 commit 6e19894
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
podman run -it \
-v ./.github/renovate.json5:/usr/src/app/renovate.json5:z \
docker.io/renovate/renovate:latest \
ghcr.io/renovatebot/renovate:latest \
renovate-config-validator
3. Commit.
Expand Down Expand Up @@ -42,10 +42,6 @@
"github>containers/automation//renovate/defaults.json5"
],

// Permit automatic rebasing when base-branch changes by more than
// one commit.
"rebaseWhen": "behind-base-branch",

/*************************************************
*** Repository-specific configuration options ***
*************************************************/
Expand Down

0 comments on commit 6e19894

Please sign in to comment.