Skip to content

merge: resolve conflicts with upstream/main

0a9247b
Select commit
Loading
Failed to load commit list.
Draft

refactor!: remove deprecated Eval API and related APIs #5290

merge: resolve conflicts with upstream/main
0a9247b
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Mar 27, 2026 in 0s

1 rule matches and 2 potential rules

Rule: ping author on conflicts and add 'needs-rebase' label (comment, label)

  • conflict
  • -closed
  • -label~=stale

✅ Rule: remove 'needs-rebase' label when conflict is resolved (label)

  • -closed
  • -conflict

Rule: queue approved PRs for merge (queue)

  • #approved-reviews-by>=1
  • -draft
  • -draft [📌 queue requirement]
  • check-success=ci-status
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue rule default]
      • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
      • branch-protection-review-decision = APPROVED [🛡 GitHub branch protection]
      • any of: [🛡 GitHub branch protection]
        • check-neutral = ci-status
        • check-skipped = ci-status
        • check-success = ci-status
      • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by=0
  • -closed
  • -closed [📌 queue requirement]
  • -conflict
  • -conflict [📌 queue requirement]
  • -label~=stale
  • base=main
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed

💖  Mergify is proud to provide this service for free to open source projects.

🚀  You can help us by becoming a sponsor!


2 not applicable rules

Rule: auto-approve dependabot github-deps PRs (review)

  • -draft
  • author=dependabot[bot]
  • title~=^chore\(github-deps\)
  • -closed
  • -conflict

Rule: queue approved PRs on stable release branches (queue)

  • #approved-reviews-by>=1
  • -draft
  • -draft [📌 queue requirement]
  • base~=^release-[0-9]+\.[0-9]+\.x$
  • check-success=ci-status
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue rule default]
      • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
      • branch-protection-review-decision = APPROVED [🛡 GitHub branch protection]
      • any of: [🛡 GitHub branch protection]
        • check-neutral = ci-status
        • check-skipped = ci-status
        • check-success = ci-status
      • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by=0
  • -closed
  • -closed [📌 queue requirement]
  • -conflict
  • -conflict [📌 queue requirement]
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com