reconcile

Detect multi-session drift in parallel Claude Code worktrees using git history and state checks.

9|1|Updated Mar 26, 2026
One-click install
npx skills add https://github.com/conorbronsdon/claude-code-skills --skill reconcile-conorbronsdon
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: reconcile
Source: https://github.com/conorbronsdon/claude-code-skills/tree/main/reconcile
Command: npx skills add https://github.com/conorbronsdon/claude-code-skills --skill reconcile-conorbronsdon

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill finds inconsistencies that appear when multiple Claude Code sessions run in parallel, especially after merges, crashes, or worktree-based workflows.

Core Features & Use Cases

  • Commit and Branch Scan: Reviews recent git history across branches to spot overlapping edits and unmerged work.
  • File and State Validation: Compares modified files, state logs, and timestamps to detect duplicate entries, contradictions, and orphaned references.
  • SSOT Drift Detection: Checks for single-source-of-truth violations where the same fact appears in multiple files with different values.
  • Use Case: Run it after merging worktrees or recovering from a crash to surface drift before it causes subtle bugs or documentation confusion.

Quick Start

Ask Claude Code to run a reconcile check on the repository and report any branch conflicts, state drift, or SSOT violations.

Frequently Asked Questions about reconcile

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I detect state drift across parallel git worktrees after a merge?

To detect state drift across parallel git worktrees, you can run a reconcile check that reviews recent git history, compares modified files, and validates state consistency to surface overlapping edits or unmerged work before they cause subtle bugs.

What are SSOT violations and how do I find them after a Claude Code crash?

SSOT violations occur when the same fact appears in multiple files with different values. A reconcile check validates single-source-of-truth consistency by comparing state logs and file diffs to surface contradictions introduced during a crash or parallel session.

How do I check for merge conflicts and orphaned references in state files?

You can check for merge conflicts and orphaned references by scanning recent git branch history and comparing state file timestamps. This read-only reconcile process detects duplicate entries, contradictions, and unmerged work without modifying your repository.

Can I use this to validate state consistency without modifying my repository?

Yes, you can validate state consistency safely because the reconcile process stays strictly read-only until approval. It reviews git history, file diffs, and SSOT validation checks to detect drift without making automatic commits or file modifications.

When do I need to run a git worktree reconciliation check?

You should run a worktree reconciliation check after merging branches, recovering from a Claude Code session crash, or performing periodic sanity checks when multiple parallel sessions may have caused commits, state files, or documentation to diverge.

What is the best way to catch session drift in parallel Claude Code worktrees?

The best way to catch session drift is running a reconcile check that uses recent git history, file diffs, and state consistency checks to detect overlapping edits, duplicate state entries, and SSOT violations across parallel worktrees before they break work.