Merge agent memory and state files (napkin, repo-continuity, distilled, thread records, registers) by reconciling CONCEPTS, not lines. Use whenever these files diverge across branches or sessions and a merge, rebase, cherry-pick, or post-update `gh pr merge` would combine them — git line-merges silently corrupt the meaning.
Installs into .claude/skills of the current project.
Are you the author of Oak Semantic Merge?
Add the live security badge to your README. It updates with every re-scan.
[](https://www.skillsdirectory.com/skills/oaknational-oak-semantic-merge-oak-open-curriculum-ecosystem)
---
name: oak-semantic-merge
description: Merge agent memory and state files (napkin, repo-continuity, distilled, thread records, registers) by reconciling CONCEPTS, not lines. Use whenever these files diverge across branches or sessions and a merge, rebase, cherry-pick, or post-update `gh pr merge` would combine them — git line-merges silently corrupt the meaning.
---
# Semantic Merge (Claude Code)
Read and follow `.agent/skills/semantic-merge/SKILL-CANONICAL.md`.
