zlacker

[return to "Stacked Diffs with git rebase —onto"]
1. mytail+G8f[view] [source] 2025-12-05 14:32:19
>>flexdi+(OP)
Instead of "stacked diffs", isn't the more "continuous integration" solution to split a big feature into small chunks that actually get merged?

Having to rebase again and again is a symptom that a dev branch is living for too long.

◧◩
2. glenja+Eff[view] [source] 2025-12-05 15:03:48
>>mytail+G8f
I’m amazed that this comment is so low down

Stacked diffs seems like a solution to managing high WIP - but the best solution to high WIP is always to lower WIP

Absolutely everything gets easier when you lower your work in progress.

◧◩◪
3. happyt+Dlf[view] [source] 2025-12-05 15:29:33
>>glenja+Eff
This seems idealistic. It's very normal to be working on a feature that depends on a not-yet-merged feature.
◧◩◪◨
4. glenja+wrf[view] [source] 2025-12-05 15:53:19
>>happyt+Dlf
I invite you to look into feature flagging.

It is entirely viable to never have more than 1 or 2 open pull requests on any particular code repository, and to use continuous delivery practices to keep deploying small changes to production 1 at a time.

That's exactly how I've worked for the past decade or so.

[go to top]