Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature] Automatically merge from dev branch to release branch #372

Open
makubacki opened this issue Sep 23, 2024 · 0 comments
Open

[Feature] Automatically merge from dev branch to release branch #372

makubacki opened this issue Sep 23, 2024 · 0 comments
Assignees
Labels
type:feature-request A new feature proposal

Comments

@makubacki
Copy link
Member

Mu changes now go into a dev branch. If the changes are appropriate to go into the corresponding release branch, they are manually cherry-picked. This feature request has the following parts:

  1. Add a new checkbox to the PR description that indicates if it should be copied to the release branch
    • Add a label to reflect this as well (e.g. type:include-in-release).
  2. Add a dev/* post-merge triggered workflow that will automatically attempt to cherry-pick the merged commits onto the corresponding release/* branch.
    • In case of a conflict, a PR will automatically be created into the release/* branch with the Mu maintainers added as reviewers. Any Mu maintainer can resolve the conflict and update the PR such that it can be merged. Because the conflict resolution may involve new modifications, it will follow the standard two reviewer and status check requirements to be merged into the `release/*' branch.
@makubacki makubacki added the type:feature-request A new feature proposal label Sep 23, 2024
@makubacki makubacki self-assigned this Sep 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type:feature-request A new feature proposal
Projects
None yet
Development

No branches or pull requests

1 participant