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

Allow building the combined PR from a fresh base branch #48

Merged
merged 5 commits into from
Jul 18, 2024

Conversation

loganswartz
Copy link
Contributor

Allow building the combined PR from a fresh base branch

This PR allows recreating the combined PRs branch from scratch every time, while reusing the existing combined PR (to avoid PR number churn).

It does this by creating a temporary working branch, merging all the appropriate PRs into that, force-updating the main combined PR branch to the latest commit of the working branch, and then deleting the working branch.

This should make it easier to a) minimize the amount of extraneous merge commits when PRs are updated and merged multiple times, and b) remove any issues caused by force-pushing in any of the combined PRs.

Misc

Unrelated to these changes, I also added a row to the Inputs table in the README to document the combine_branch_name option, which exists in the code but was missing in the README.

@GrantBirki
Copy link
Member

@loganswartz thank you for this PR! Sorry that it has sat for almost a month before I was able to see it. I'll try and give this a review soon! 🚀

Copy link
Member

@GrantBirki GrantBirki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@loganswartz thank you for your contributions! This change looks great. I'll get it released in v5.1.0 🚀

@GrantBirki GrantBirki merged commit 20d70f9 into github:main Jul 18, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants