feat(sync): detect merged parent branches via git history#74
Merged
Conversation
When no PR is found for a branch, fall back to `git merge-base --is-ancestor` to check if it was merged into the base branch. This handles cases where PRs are missing or from external repos. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
javoire
force-pushed
the
detect-merged-parent-branches
branch
from
62232cf to
96e1291
Compare
Owner
Author
|
🎉 This PR is included in version 1.21.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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.
Summary
IsAncestorgit client method wrappinggit merge-base --is-ancestorstack sync, when no PR is found for a branch, falls back to git history to detect if it was merged into the base branch — handles both "own branch merged" (remove from stack) and "parent merged" (reparent children)stack status, shows a hint when a branch appears merged via git historyThis fixes the case where a parent branch was merged (e.g. via a PR in a different repo or when PR lookup fails) but stackinator couldn't detect it because it only relied on GitHub PR status.
🤖 Generated with Claude Code