Skip to content

Merge branch 'master' into fix/on_error/controller_deactivation

cea246a
Select commit
Loading
Failed to load commit list.
Merged

Fix the controller deactivation on the control cycles returning ERROR #1756

Merge branch 'master' into fix/on_error/controller_deactivation
cea246a
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Feb 12, 2025 in 2s

3 potential rules

⚠️ The pull request has been merged by @destogl

Rule: Backport to humble at reviewers discretion (backport)

  • label=backport-humble
  • base=master
  • merged [📌 backport requirement]

Rule: Backport to iron at reviewers discretion (backport)

  • label=backport-iron
  • base=master
  • merged [📌 backport requirement]

Rule: Ask to resolve conflict (comment)

  • conflict
  • author!=dependabot[bot]
  • author!=mergify[bot]

💖  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: Ask to resolve conflict for backports (comment)

  • author=mergify[bot]
  • conflict

Rule: development targets master branch (comment)

  • author!=saikishor
  • base!=master
  • author!=bmagyar
  • author!=christophfroehlich
  • author!=dependabot[bot]
  • author!=destogl
  • author!=mergify[bot]
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