Stacked Pull Requests: Can we get a 'Merge Latest Into Stack' button as an alternative to 'Rebase Stack' button #203968
Replies: 4 comments
|
💬 Your Product Feedback Has Been Submitted 🎉 Thank you for taking the time to share your insights with us! Your feedback is invaluable as we build a better GitHub experience for all our users. Here's what you can expect moving forward ⏩
Where to look to see what's shipping 👀
What you can do in the meantime 💻
As a member of the GitHub community, your participation is essential. While we can't promise that every suggestion will be implemented, we want to emphasize that your feedback is instrumental in guiding our decisions and priorities. Thank you once again for your contribution to making GitHub even better! We're grateful for your ongoing support and collaboration in shaping the future of our platform. ⭐ |
|
Also, rebasing the branches and force-pushing makes "Change since your last review" diff option in Github practically useless. That option helps a lot during the review process, letting reviewers review just the changes that were made after the prior review, and skip reviewing everything else that's unchanged. With stacked PR we can't use that diff option for obvious reasons, and that's why we can't adopt this in our team yet. |
|
also, reconsiling my local branches, that might have additional commits, with auto-rebased remote branches is quite a pain. merges would make that a lot simpler |
|
On top of all of the above, in the era of AI, all AI agents, trying to consolidate the local branches with the remote branches, have issues because all of them see changes "Force-pushed" so they raise a flag and start checking the entire diff to make sure nothing is broken. Merging latest in the stack will resolve this. |
Uh oh!
There was an error while loading. Please reload this page.
🏷️ Discussion Type
Product Feedback
Body
Would be cool if Github could allow stacks to merge master through instead of rebase
I tried stacks but abandoned them because they are based on rebasing. Rebasing is something I only do on my branch before sharing it with others because it changes the history. I try to avoid a rebase and --force-push after publishing my branch to the remote
Seems like the stack feature is supposed to help when sharing code with others. I forsee many --force-push commands with this feature which seems dangerous.
Currently I stack PRs manually and 'merge' master through the stack when a conflict arises. Would be cool if Github could allow stacks to merge master through instead of rebase
All reactions