Skip to content

Disable auto rebasing for depandabot PRs #2987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2022
Merged

Disable auto rebasing for depandabot PRs #2987

merged 1 commit into from
Jan 13, 2022

Conversation

bahusoid
Copy link
Member

@bahusoid bahusoid commented Jan 13, 2022

Quite annoying and floods Team City builds

@hazzik hazzik added this to the next minor milestone Jan 13, 2022
@hazzik hazzik merged commit 9bcac48 into master Jan 13, 2022
@hazzik hazzik deleted the bahusoidDpndBot branch January 13, 2022 20:04
@hazzik
Copy link
Member

hazzik commented Jan 17, 2022

It just did not care about this option.

@bahusoid
Copy link
Member Author

Huh.. It works quite strange.. This setting is surely somehow applied as newly created PRs have different comment:
#2996:

You can trigger a rebase of this PR by commenting @dependabot rebase.

While in old PRs
#2978

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

But why this setting is ignored in OLD PRs.... Should they be recreated?

@bahusoid
Copy link
Member Author

I contacted github sometime ago to clarify rebase_strategy disabled behavior. Their answer:

The rebase_strategy setting determines whether Dependabot rebases PRs in real-time as they go into conflict. When disabled, Dependabot will only rebase PRs as part of our scheduled job run. There is currently no way to disable rebasing as part of the scheduled job since we rely on it to ensure each scheduled job refreshes PRs correctly, including closing them if they have been resolved/superseded.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants