Focusing on "fixing your history", e.g. cherry-pick and rebase. These tools don't need to be as scary as they are. How can we help make that the reality?
Perhaps we could link out to this video which really helped me construct a simple mental model for what these operations do.