{"version":"2.1.7","anchor":"git-conflict-detection-for-snapshots","canonical_anchor":"git-conflict-detection-for-snapshots","heading":"Git Conflict Detection for Snapshots","tier":null,"area":null,"scope":null,"heads_up":null,"url":"https:\/\/changelogs.core-directive.com\/v\/2.1.7\/e\/git-conflict-detection-for-snapshots","release_url":"https:\/\/changelogs.core-directive.com\/v\/2.1.7","markdown":"### Git Conflict Detection for Snapshots\n\n**What**\n\nWorktree snapshotting now detects in-progress git operations and provides clearer errors.\n\n**Details**\n\n- Detects cherry-pick, rebase, merge, revert, am, and bisect operations\n- Throws descriptive error: \"Cannot snapshot worktree: in-progress {operation} operation detected\"\n- Also detects uninitialized repositories and prompts for initial commit\n\n**Evidence**\n\n`a77()` at line 458650 (conflict detection, contains `\"cherry-picking\"`, `\"rebasing\"`)"}