The Complete Claude Guide
← Back to topic
Chapter 05 · CLI

Sessions: resume, continue, branch and history management

Claude Code sessions persist and you can return to them: resume a previous session, continue the latest one, and fork/branch at a split point. Managing history well saves work and prevents confusion.

Verified against source on 2026-09-30

Video

Resume a conversation without confusing file state

You will name a session, resume it and explore a conversation branch without assuming files were rolled back. Examples are illustrations.

Sources checked September 30, 2026 describe locally saved sessions tied to working directories. Resuming restores conversation continuity; current files and Git branch still need inspection. A conversation branch is not a Git branch or isolated worktree.

Leave an accurate stopping point

Before leaving:

Summarize the current practice task: inspected files, completed changes,
actual test results, remaining questions and unapproved actions.
Do not make further edits.

Give the session a meaningful name through /rename if available. Keep secrets out of titles and summaries. Record the working directory and repository branch separately.

Illustrative stopping point:

Task: course-list toggle.
Changed: index.html.
Checked: two clicks; keyboard check still pending.
Remaining: verify keyboard and narrow layout.
Not approved: PR or publication.

Compare to the actual file and tests. A summary is not the source of truth.

Choose continue or resume

From the same practice directory:

claude --continue

This continues the recent session for the directory. To select among sessions:

claude --resume

Inside an interactive session, /resume opens the picker. Inspect session title, directory and relevant history before selecting. The source describes default worktree scoping and options to widen search; wider listings do not mean every session belongs to the current code checkout.

Recheck current files before work
We are resuming. First inspect the current practice file and report differences
from the stopping summary. Do not edit yet.
Confirm the remaining tests and ask before changing scope.

If someone edited the file meanwhile, current code can differ from old history. Do not execute the old plan unchanged. Git branch switching changes visible files without rewriting the conversation's past facts.

Branch an idea, not the filesystem

The documented /branch or --fork-session creates a new conversation identity with copied history. It does not automatically give separate files.

For this exercise, compare an alternative plan without writing:

Propose an alternative button label only.
Keep it as a proposal; do not edit files or switch Git branches.

Use a separate worktree before parallel writing, covered later. Do not open the same session in two terminals for competing edits without understanding coordination.

History and cleanup

Local session records can contain source text, tool outputs and private material. Closing the terminal is not automatic deletion. Use the documented local-data controls and organization policy when cleanup is required. Never share a raw transcript casually.

Archiving, deleting conversations, restoring file checkpoints and Git restoration are different operations. Do not delete a session to undo a code change.

Graded practice

Easy: find the correct session

Name and resume it. Success: matching directory, task and history.

Intermediate: changed file

Modify a harmless source copy outside the session, then resume read-only. Success: identify current differences before acting.

Challenging: alternative without collision

Branch a conversation and request a plan only. Success: understand no filesystem isolation was created.

Troubleshooting

Wrong recent session: use the picker and inspect context rather than trusting --continue blindly.

History differs from code: re-read current files and branch.

Missing session: check directory, worktree scope and local account/environment before declaring it gone.

Two writers collide: stop, inspect diff and separate workspaces before continuing.

Need restoration: use the tool matching what must be restored, not session deletion.

Filmed demo · Video is added in the media phase

Recap

Comprehension check

When would you fork a session?

Recap

Sources and further reading

← Previous Back to topic Next →