-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Add manual merges to feature branch #81428
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
base: main
Are you sure you want to change the base?
Conversation
| on: | ||
| schedule: | ||
| # Create a merge every day (works only for merges from `main`, others would need a `push` trigger). | ||
| - cron: '0 0 * * *' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this can be changed to whatever (currently daily, could be weekly like the old tool)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed, once this merges to main, the action can be manually invoked to trigger the merge.
e4c3d7b to
c552807
Compare
|
Is it going to be possible to manually specify the name of the base branch, when running this action manually? Or will we need to merge an edit to the config file first? |
Like have the workflow write a branch merge config prior to launching the inter-branch-merge template against it? |
I think this would be overkill. It would be reasonable for the inter-branch-merge template itself to allow specifying the base and/or head branch we want to create a merge PR for, when it is run, rather than needing to put that info in a config file first. That is, those arguments would be an alternative to writing a config file. But, it seems like it would be unrealistic to make that happen as part of this change. |
the merge configuration for both the base and target has to be specified in the config. generally this is more appropriate for a long running merge you want to configure. likely will not help much for one-offs. |
c552807 to
97b5995
Compare
No description provided.