> printf debugging isn't without its annoyances, namely removing the print statements once you're done.

Use something like stacked git[1], and then it's just one "stg pop" and poof, they're gone.

[1] https://stacked-git.github.io/

I’ve been doing this (manually) for about 10+ years.

I rarely use branches, my local work area is about 50-100 commits on top of master.

I pick/reorder/edit with “git rebase -i”

I’ll prefix the commit summary with a word that helps me keep straight debug changes from ones that will go toward a MR.

I usually leave them as uncommitted changes, then git checkout to undo them. And using something like `git add -p` to skip Printfs if I need to commit other changes.