feat(rebase): reset fully-merged branches to base instead of skipping#452
Merged
feat(rebase): reset fully-merged branches to base instead of skipping#452
Conversation
When a branch is fully merged (rebase-merged or squash-merged) into main with no new local work, rebase now resets the branch to origin/main instead of skipping with "already merged." Merge mode fast-forwards. https://claude.ai/code/session_01JwYwdYdscozHuZVPdrM9pq
Update existing tests that expected fully-merged repos to be skipped. They now expect the reset-to-base behavior instead. https://claude.ai/code/session_01JwYwdYdscozHuZVPdrM9pq
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
2 participants
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.
When a branch is fully merged (rebase-merged or squash-merged) into
main with no new local work, rebase now resets the branch to origin/main
instead of skipping with "already merged." Merge mode fast-forwards.
https://claude.ai/code/session_01JwYwdYdscozHuZVPdrM9pq