Allow building the combined PR from a fresh base branch #48
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrantBirki
reviewed
Jul 18, 2024
|
@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! 🚀 |
GrantBirki
approved these changes
Jul 18, 2024
There was a problem hiding this comment.
@loganswartz thank you for your contributions! This change looks great. I'll get it released in v5.1.0 🚀
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
Inputstable in the README to document thecombine_branch_nameoption, which exists in the code but was missing in the README.