I think the tl;dr is “stacked diffs require running different commands than git pull --rebase” The author complains about wasting time branching and merging, b

I think the tl;dr is “stacked diffs require running different commands than git pull --rebase” The author complains about wasting time branching and merging, but other examples at the end still have the same number of operations and still hit the same merge conflicts. They make the point of how dependant work requires multiple branches but I feel it’s a workflow constraint, or a technical one. It can be easily avoided by creating branches as late as possible! Usually, when I’m working on a problem that requires multiple merges, I 1. Create a branch to fix the problem 2. Work on it 3. Rebase it so I can merge the first few commits 4. Push just those commits with a different branch name 5. Get it reviewed 6. a. Merge the reviewed branch into master and rebase the problem branch on top of master 6. b. Update the branch under review with feedback fixes, push it & update the review & rebase the problem branch onto the updated branch under review & go back to 5 7. Go back to 2 Just don’t do what I end up doing on personal projects and let 6 months go past between 2 and 3