[entangledqubit]

I'm a big fan of that practice but I get the impression that rebasing scares a lot of devs that either didn't take the time to learn git or are still recovering from that one time that their change got too far away from mainline. That latter reason is why I prefer the practice actually...

[nerdponx]

Or they were taught Git the wrong way, by memorizing a bunch of commands, as in TFA.

[hughesjj]

When in doubt, git diff main>~/patch.out

(... && Git checkout main && git pull --rebase && git checkout -B clean_branch && git apply ~/patch.out)

(I like the light rhyming of the first part)