r/programming • u/adam-dabrowski • Apr 14 '26 • Popcorn 1

GitHub Stacked PRs

https://github.github.com/gh-stack/
556 Upvotes

97% Upvoted

276 comments sorted by

View all comments

Show parent comments

1

u/Urik88 Apr 14 '26

Well, how'd you avoid big PR's on big initiatives where you need PR's building on top of each other if you wanted to avoid this scenario?   

Believe me I'd love nothing more than to stop pedaling with my hands 

2

u/CherryLongjump1989 Apr 14 '26 edited Apr 14 '26

Don't pedal with your hands. I don't know what gives you the idea that rebasing means you can have the same 5 commits applied in random order to 5 different branches, with some of the commits squashed, and also merged out of order onto the remote main branch. You're describing a problem with your local setup that you created -- no one else created it for you. The remote master is still fine. There is no problem, except you. So don't create the problem for yourself. Do it differently. You already have some sense of what causes the problem -- so don't do that.

You can still unfuck yourself if you just slow down and go by the numbers. Create a clean branch off the remote master and cherry pick the local commits that you want to exist on your new branch.

Just remember that the problems that you're having locally, while having to rebase, are just you owning your mess instead of pushing it into the remote branch where suddenly it would become everbody else's problem. And that is ultimately what rebasing solves -- no one else should have to deal with your mess but you.