Skip to content

Conversation

@dibarbet
Copy link
Member

No description provided.

@dibarbet dibarbet marked this pull request as ready for review November 24, 2025 19:43
@dibarbet dibarbet requested a review from a team as a code owner November 24, 2025 19:43
@jcouv jcouv self-assigned this Nov 24, 2025
on:
schedule:
# Create a merge every day (works only for merges from `main`, others would need a `push` trigger).
- cron: '0 0 * * *'
Copy link
Member Author

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)

Copy link
Member Author

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.

@dibarbet dibarbet force-pushed the dev/dibarbet/schedule_merge branch 2 times, most recently from e4c3d7b to c552807 Compare November 24, 2025 21:25
@dibarbet dibarbet changed the title Add scheduled merges to feature branch Add manual merges to feature branch Nov 24, 2025
@RikkiGibson
Copy link
Member

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?

@JoeRobich
Copy link
Member

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?

@RikkiGibson
Copy link
Member

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.

@dibarbet
Copy link
Member Author

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?

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.

@dibarbet dibarbet force-pushed the dev/dibarbet/schedule_merge branch from c552807 to 97b5995 Compare November 25, 2025 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants