On merged PRs with the label 'backport-v0.34.x' and 'backport-v0.37.x', PRs are backported to the respective branch automatically, i.e. a PR is opened automatically.

[p-offtermatt]

Problem statement:

It is annoying to manually cherry-pick all commits that should be backported to the primary branches v0.34.x and v0.37.x.
To avoid this, the backporting should happen automatically as much as possible.

Possible solutions:

• Backport via Github action?
• Mergify bot?

For now, I will try to solve this via Github action to avoid the reliance on another framework.

[p-offtermatt]

I attempted the following options:

• Github action that clones/cherry-picks: Did not work with merge conflicts and gave up. did not see an easy way to fix that
• https://github.com/sqren/backport: did not work for me as intended, failed with a hard-to-debug error and I did not look much deeper.
• https://github.com/tibdex/backport: error and no helpful error message, either
• https://github.com/marketplace/actions/backporting: also fails with merge conflicts

I'm unplanning this, since it seems like more effort than it's worth for now. I'm trying out using backport locally for now, and might retry the CI integration if locally works well

[p-offtermatt]

Mergify seems like a good solution for this, but requires being activated for the whole org (to my understanding). Will reopen for now and hope for a way to sort this out

[p-offtermatt]

Mergify was enabled and seems to be backporting PRs successfully, so this is resolved.