memory-merge

What problem does it solve?

This Skill resolves conflicts and consolidates duplicate or overlapping team memory files stored in .claude/memory/, preventing data loss while reducing redundancy and improving scannability of project memory.

Core Features & Use Cases

• Detects conflicted files and stray merge markers, identifies overlapping topics across deep files, and flags oversized hot caches like project.md or reference.md.
• Classifies conflict types (additive, semantic duplicate, conflicting content, duplicate files) and prescribes curated resolutions that preserve authorship, timestamps, and provenance.
• Proposes a clear diff plan for user approval, applies merges with metadata updates (last-updated, supersedes), safely removes dropped files via git, and verifies no conflict markers remain.
• Use cases: resolve memory conflicts after a git pull, consolidate duplicate topic files (e.g., auth.md vs auth-decision.md), and prune oversized project.md to keep the hot cache within budget.

Quick Start

Ask the agent to detect and propose a safe merge plan for conflicts in .claude/memory/ and then apply the approved changes.