Comment by mytailorisrich

3 days ago

Stacked pull requests seem to add a layer of complexity to solve a problem that should and can be avoided in the first place.

Frequent, small changes are really a good practice.

Then we have things like trunk-based development and continuous integration.

10 comments

mytailorisrich

Reply
vlovich123  3 days ago

I’m confused. How do you do frequent small changes and avoid stacked PRs. Do you just do a small commit, wait for a review, merge, do another small commit? Or do you make a bunch of small commits locally and only put up the next one for review when the previous one is reviewed and merged?

That’s the only models I can think of and it’s weird to advocate to have a variable time asynchronous process in the middle of your code or review loops. Seems like you’re just handicapping your velocity for no reason.

Stacked PRs are precisely about factoring out small changes into individually reviewable commits that can be reviewed and landed independently, decoupling reviewer and developer while retaining good properties like small commits that the reviewer is going to do a better job on, larger single purpose commits that the reviewer knows to spend more time on without getting overwhelmed dealing with unrelated noise, and the ability to see relationships between smaller commits and the bigger picture. Meanwhile the developer gets to land unobtrusive cleanups that serve a broader goal faster to avoid merge conflicts while getting feedback quicker on work while working towards a larger goal.

The only time stacked commits aren’t as useful is for junior devs who cants organize themselves well enough to understand how to do this well (it’s an art you have to intentionally practice at) and don’t generally have a good handle on the broader scope of what they’re working towards.

  • jacques_chester  3 days ago

    Trunk-based development, by itself, is a fool's errand.

    But combine it with TDD & pairing and it becomes a license to deliver robust features at warp speed.

    • vlovich123  2 days ago

      I don’t follow. Regardless of where you merge, are you not developing features on a shared branch with others? Or do you just have a single long development branch and then merge once “you’re done” and hope that there’s no merge conflicts? But regardless, I’m missing how reviews are being done.

johnmaguire  3 days ago

Stacked PRs allow me to post frequent, small changes without waiting for a review between each one.

  • mytailorisrich  3 days ago

    Well, you don't need stacked PRs for that...

    I think stacked PRs are a symptoms of the issues the underlying workflow (feature branches with blocking reviews) has.

    • ncruces  3 days ago

      “What you'll do next and in what way” is often an important tool to put the small changes into context.

      Stacked pull requests can be an important tool to enable “frequent, small changes” IMO.

      Sure, I can use a single pull request and a branch on top of that, but then it's harder for others to leave notes on the future, WIP, steps.

      A common situation is that during code review I create a few alternative WIP changes to communicate to a reviewer how I might resolve a comment; they can do the same, and share it with me. Discussion can fork to those change sets.

      Gerrit is much closer to my desired workflow than GitHub PRs.

      3 replies →