Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

Add mergify bot backport functionality #756

Closed
fedekunze opened this issue Nov 16, 2021 · 3 comments · Fixed by #784
Closed

Add mergify bot backport functionality #756

fedekunze opened this issue Nov 16, 2021 · 3 comments · Fixed by #784

Comments

@fedekunze
Copy link
Contributor

fedekunze commented Nov 16, 2021

Automatically backport PRs to release/0.7.x branch based on PR label

Ref: https://github.com/cosmos/cosmos-sdk/blob/master/.mergify.yml

@fedekunze
Copy link
Contributor Author

@tomtau @yihuang @thomas-nguy this will ease the backporting process for you guys

@thomas-nguy
Copy link
Contributor

just by curiousity, how does the bot handle merge conflict?

@tomtau
Copy link
Contributor

tomtau commented Nov 17, 2021

@thomas-nguy AFAIK it won't open a PR if there's a conflict... one can set ignore_conflicts https://docs.mergify.com/actions/backport/#options in which case, it'll just open the PR with conflicts and a maintainer needs to manually resolve it (either in GitHub UI or by directly working on the branch the bot created)

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

Successfully merging a pull request may close this issue.

3 participants