Repository navigation
fix(sync): stop when a merged pull request is still in the stack - #41
Merged
wsehl merged 1 commit intoSep 29, 2026
Conversation
After a squash or rebase merge, the original commit stays in local history until the branch is rebased. Syncing then re-pushed the merged branch (recreating it if GitHub had deleted it), matched the change to its merged PR, and left the merged changes in every PR above it. Sync now checks this during planning, before anything is pushed or edited, and asks the user to rebase onto the remote base first. Dry run reports the same error. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> bstack-id: 70c558ad2f27440984a1cd55d30e71fd
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
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.
After a squash or rebase merge, the original commit stays in local
history until the branch is rebased. Syncing then re-pushed the merged
branch (recreating it if GitHub had deleted it), matched the change to
its merged PR, and left the merged changes in every PR above it.
Sync now checks this during planning, before anything is pushed or
edited, and asks the user to rebase onto the remote base first. Dry run
reports the same error.
🤖 Generated with Claude Code
Co-Authored-By: Claude Opus 5.5 (1M context) noreply@anthropic.com