mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-06-15 05:47:18 -07:00
Merge remote-tracking branch 'origin/main' into gemini-cli-resume-minimal
# Conflicts: # docs/cli/cli-reference.md # packages/cli/src/gemini.test.tsx # packages/cli/src/ui/AppContainer.tsx # packages/cli/src/ui/components/DialogManager.tsx # packages/cli/src/ui/components/SessionBrowser.tsx # packages/cli/src/ui/components/SessionSummaryDisplay.test.tsx # packages/cli/src/ui/components/SessionSummaryDisplay.tsx # packages/cli/src/ui/components/__snapshots__/SessionSummaryDisplay.test.tsx.snap # packages/cli/src/ui/hooks/useSessionBrowser.test.ts # packages/cli/src/ui/hooks/useSessionResume.test.ts # packages/cli/src/utils/sessionUtils.test.ts # packages/cli/src/utils/sessionUtils.ts # packages/core/src/services/chatRecordingService.ts
This commit is contained in:
@@ -104,9 +104,9 @@ Gemini gives you granular control over the undo process. You can choose to:
|
||||
Sometimes you want to try two different approaches to the same problem.
|
||||
|
||||
1. Start a session and get to a decision point.
|
||||
2. Save the current state with `/chat save decision-point`.
|
||||
2. Save the current state with `/resume save decision-point`.
|
||||
3. Try your first approach.
|
||||
4. Later, use `/chat resume decision-point` to fork the conversation back to
|
||||
4. Later, use `/resume resume decision-point` to fork the conversation back to
|
||||
that moment and try a different approach.
|
||||
|
||||
This creates a new branch of history without losing your original work.
|
||||
@@ -116,5 +116,5 @@ This creates a new branch of history without losing your original work.
|
||||
- Learn about [Checkpointing](../../cli/checkpointing.md) to understand the
|
||||
underlying safety mechanism.
|
||||
- Explore [Task planning](task-planning.md) to keep complex sessions organized.
|
||||
- See the [Command reference](../../reference/commands.md) for all `/chat` and
|
||||
`/resume` options.
|
||||
- See the [Command reference](../../reference/commands.md) for `/resume`
|
||||
options, grouped checkpoint menus, and `/chat` compatibility aliases.
|
||||
|
||||
Reference in New Issue
Block a user