chore: Switch from --rebase to --ff-only #2680
Merged
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
eablack
force-pushed
the
eb/use-ff-only-in-create-release
branch
from
2358d01 to
f8c7e91
Compare
eablack
changed the title
k80bowman
approved these changes
Mar 6, 2024
eablack
force-pushed
the
eb/use-ff-only-in-create-release
branch
from
f8c7e91 to
afb168e
Compare
eablack
had a problem deploying
to
AcceptanceTests
GitHub Actions
Failure
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.
Description
Opened this in favor of #1779 to avoid rebasing.
Testing
The
create-release-prscript must be run onmain, so you'll have to just locally editmainwith these changes to test. Simply runningcreate-release-prfrom your terminal with those changes and verifying it correctly creates a release pr is sufficient for testing.