Source Intelligence
Follow Discord

DisclaimerUnofficial, and not affiliated with Anthropic. Nearly all of this is read straight out of what ships: npm bundles, captured prompts, published docs. Anthropic's own notes go in verbatim, marked as theirs. The rest is my reading, and every entry carries the strings behind it. If one looks wrong, vote it down and say why.

← All of v2.1.7 Home All releases ←olderv2.1.6 v2.1.8newer→
Claude Code v2.1.7

Git Conflict Detection for Snapshots

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.

Related

Other releases about the same thing. Found by shared names or similar wording; neither means one caused the other.

See this entry in the whole of v2.1.7 →