Quick tip when working with Claude Code and Git: When you're happy with an intermediate result, stage the changes by running `git add` (no commit). That makes it possible to always go back to the staged changes when Claude messes up. You can then just discard the unstaged changes and don't have to roll back to the latest commit.

I haven't used it, but saw this the other day: https://github.com/RonitSachdev/ccundo

Git or my favorite "Undo all of those changes."

this usually gets the job done for me as well