dependabot / dependabot-core

🤖 Dependabot's core logic for creating update PRs.

Home Page:https://docs.github.com/en/code-security/dependabot

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

Auto-rebase does not work when auto-merge enabled

JuanLUJoanne opened this issue · comments

Is there an existing issue for this?

  • I have searched the existing issues

Package ecosystem

npm, Bundler

Package manager version

No response

Language version

No response

Manifest location and content before the Dependabot update

No response

dependabot.yml content

No response

Updated dependency

No response

What you expected to see, versus what you actually saw

We expected the Dependency bot to still automatically rebase when there are merge conflicts after the auto-merge workflow is enabled.

However, the current behavior is that the Dependency bot stops automatically rebasing when there are merge conflicts.
And we need to manually type comments in the PR @dependabot rebase to ask the Dependency bot to rebase.

Native package manager behavior

No response

Images of the diff or a link to the PR, issue, or logs

No response

Smallest manifest that reproduces the issue

version: 2
updates:
  - directory: /infrastructure
    package-ecosystem: npm
    schedule:
      interval: weekly
      day: wednesday
      time: "10:00"
      timezone: Australia/Melbourne
    open-pull-requests-limit: 50
    allow:
      - dependency-type: all
    commit-message:
      prefix: Dependabot

I've also noticed this. Sometimes it will rebase, but sometimes it will not. I think there might be a race condition with the checks when more than one dependency gets merged simultaneously.