Skip to content

Commit 6e19894

Browse files
committed
renovate: stop rebasing PRs automatically
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 <pholzing@redhat.com>
1 parent 3ca4655 commit 6e19894

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

.github/renovate.json5

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
1313
podman run -it \
1414
-v ./.github/renovate.json5:/usr/src/app/renovate.json5:z \
15-
docker.io/renovate/renovate:latest \
15+
ghcr.io/renovatebot/renovate:latest \
1616
renovate-config-validator
1717
3. Commit.
1818
@@ -42,10 +42,6 @@
4242
"github>containers/automation//renovate/defaults.json5"
4343
],
4444

45-
// Permit automatic rebasing when base-branch changes by more than
46-
// one commit.
47-
"rebaseWhen": "behind-base-branch",
48-
4945
/*************************************************
5046
*** Repository-specific configuration options ***
5147
*************************************************/

0 commit comments

Comments
 (0)