Reconcile

/reconcile — Multi-Session Drift Check

When running multiple Claude Code sessions in parallel (especially with worktrees), files can drift out of sync. This skill scans for inconsistencies and proposes fixes.

When to Use

• After merging worktree branches back to main
• When something "feels off" after parallel work
• After a crash where multiple sessions were open
• As a periodic sanity check during heavy parallel workflows

Instructions

1. Scan recent commit history across all branches

git log --all --oneline --since="24 hours ago" --graph

Look for:

• Multiple branches touching the same files
• Commits on branches that haven't been merged
• Conflicting changes (same file modified differently on different branches)

2. Check for file-level conflicts

For each file modified on multiple branches, diff the versions:

git diff main.. -- 

Flag files where:

• Both branches modified the same lines (merge conflict risk)
• One branch deleted what another modified
• Timestamps or "Last Updated" fields diverged

3. Check state file consistency

If your project uses state files (TODO lists, priority files, decision logs, session logs), check:

• Duplicate entries: Same task or decision logged twice from different sessions
• Contradictory state: One session marked something complete, another added it as in-progress
• Timestamp drift: "Last Updated" dates that don't match the most recent actual edit
• Orphaned references: Files or sections referencing things that were removed in another session

4. Check for SSOT violations

If your project has single-source-of-truth rules (facts that should only live in one file):

• Scan for duplicated facts across files
• Flag any case where the same information appears in multiple locations with different values
• Check that cross-references point to files that still exist

5. Report

RECONCILE — [DATE]

BRANCHES CHECKED:
- [branch list with last commit date]

FILE CONFLICTS:
- [file] — modified on [branch1] and [branch2] — [conflict type]

STATE DRIFT:
- [issue description]

SSOT VIOLATIONS:
- [duplicated fact] — found in [file1] and [file2]

PROPOSED FIXES:
1. [fix description]

OVERALL: [CLEAN / N issues found]

6. Apply fixes (with approval only)

Present each fix individually. Wait for approval before applying. Common fixes:

• Merge the newer version of a conflicting file
• Remove duplicate entries (keep the more detailed one)
• Update timestamps to match actual last-edit dates
• Resolve SSOT violations by keeping the canonical source and updating references

Design Principles

• Read-only by default. Report, wait for approval.
• Trust recent over old. When two versions conflict, the more recent edit is usually correct.
• Preserve intent. Don't auto-resolve — different sessions may have had different goals.
• Fast. Git commands and file reads only. Under 30 seconds for a full scan.

Source & license

This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.

• Author: conorbronsdon
• Source: conorbronsdon/claude-code-skills
• License: MIT

Install and usage instructions live in the source repository linked above.