with one click
oak-semantic-merge
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.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.