zlacker

[return to "Stacked Diffs with git rebase —onto"]
1. bvdw+U1f[view] [source] 2025-12-05 13:58:32
>>flexdi+(OP)
I've settled on a workflow that reverses the situation. I simply commit all my work to the main branch and cherry pick commits into temporary feature branches only when submitting PRs.

This way I only need to worry about maintaining a single consistent lineage of commits. I've been using this workflow for about a year now and find it to be much easier than juggling and rebasing feature branches.

In case anyone's interested, I made a tool that automates this workflow. The worfklow and tool are described here: https://github.com/bjvanderweij/dflock/

◧◩
2. motobo+O2f[view] [source] 2025-12-05 14:02:53
>>bvdw+U1f
How many people on the team?
◧◩◪
3. bvdw+5rf[view] [source] 2025-12-05 15:51:55
>>motobo+O2f
I work in a small team, about five people.
[go to top]