Vibe Coding for Production
Getting work done

Checkpointing and rewind

Restore Claude Code conversation or file changes to an earlier checkpoint without confusing rewind with Git.

Claude Code creates checkpoints before its edits so you can explore a different approach without manually reconstructing the earlier state.

Open the checkpoint picker with:

/rewind

You can also press Esc twice. See Checkpointing.

Restore options

From a checkpoint you can restore:

  • the conversation,
  • Claude’s code changes,
  • both conversation and code,
  • or summarize the work from that point.

This is useful after a wrong implementation direction, a noisy debugging branch, or a change that technically works but violates the agreed design.

What checkpoints do not capture

Checkpointing is not Git

Checkpoints cover changes made through Claude’s editing tools. File writes performed by Bash commands and most edits made inside subagents may not be captured. Checkpoints are local session recovery, not durable version history, collaboration, or backup.

Use Git commits for reviewed milestones and checkpoints for short-term experimentation between those milestones.

Workshop exercise

  1. Ask Claude to make one small, visible UI change.
  2. Continue with a deliberately different layout direction.
  3. Open /rewind.
  4. Restore conversation and code to the first direction.
  5. Check git diff and verify the restored application.

Good recovery sequence

Open /rewind and restore both code and conversation to the checkpoint before
the caching change. Then inspect git diff and summarize what still differs from
HEAD. Do not make new edits yet.

On this page