I'm a big fan of rebasing to keep the commit history clean and as a form of self-discipline when coding to make sure I'm grouping the changes atomically.

I will try to give Jujutsu a go based on your recommendation!