feat: add merge button to branch card when PR exists #11523
Conversation
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
- Add merge button to stack branch cards when a PR exists - Reuse existing merge logic from StackedPullRequestCard for consistency - Include merge status checks (permissions, mergeable state, stack constraints) - Show reopen button for closed PRs - Maintain existing View PR button alongside merge controls - Respect read-only mode (no merge button on read-only branches)
|
@flazouh is attempting to deploy a commit to the GitButler Team on Vercel. A member of the Team first needs to authorize it. |
Byron
reviewed
Dec 12, 2025
Collaborator
Byron
left a comment
There was a problem hiding this comment.
Thanks a lot for contributing! Merging branches from the branch view seems useful.
Would you have a video and/or screen shots showing it in action?
Also, since the PR seems AI generated, do you have the time to see the feature through to the end if @krlvi should think it's something we want to take on right now? My feeling is that a lot of iterations are needed to make it usable and maintainable, and my preference is to close it and postpone improvements to the branch list entirely.
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.
🧢 Changes
StackedPullRequestCardfor consistency☕️ Reasoning
This change improves the user experience by allowing users to merge PRs directly from the branch card view, without needing to navigate to a separate PR view. The merge button uses the same logic and checks as the existing PR merge flow, ensuring consistency in merge behavior and validation.
The implementation:
MergeButtoncomponent which provides merge method selection (merge, rebase, squash)