Merged
Conversation
Owner
alicederyn
commented
Jul 12, 2025
alicederyn
commented
- Delete rather than fast-forward unreferenced branches
- Fix a bug in the fast-forward safety check, which was causing it to lose changes
- Add a --help CLI param with a dynamic description based on the current repo setup
- Add integration tests of the PR merge behaviour
Add integration tests for the current, intended behaviour of fast-forward, so we do not regress.
fastforward is supposed to avoid losing changes to a branch that were not in the PR. Unfortunately, the check was accidentally using the PR branch name, not the hash, causing it to always fastforward. Fix and regression test the behaviour.
Determine what the current configuration will make the tool do, and tell the user what that is if they pass --help.
Instead of fast-forwarding unreferenced branches, delete them.
alicederyn
added
bug
alicederyn
force-pushed
the
fix.overwrite.bugs
branch
from
ab7d24c to
14c682f
Compare
alicederyn
force-pushed
the
fix.overwrite.bugs
branch
from
a72b69c to
bcadce5
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.