Claude Code v2.1.7 ·
Git Conflict Detection for Snapshots
EntryKind: in v2.1.7,
ChangesSection of the release
What
Worktree snapshotting now detects in-progress git operations and provides clearer errors.
Details
- Detects cherry-pick, rebase, merge, revert, am, and bisect operations
- Throws descriptive error: "Cannot snapshot worktree: in-progress {operation} operation detected"
- Also detects uninitialized repositories and prompts for initial commit
Evidence
a77() at line 458650 (conflict detection, contains "cherry-picking", "rebasing")
Strings lifted out of the shipped bundle, so the claim above can be checked against them.
See this entry in the whole of v2.1.7 →
