Structured workflow for merging significantly diverged branches. Use when either branch has changed 100+ files, a dry-run merge produces 10+ conflicts, or the other branch refactored core interfaces your branch consumes.
Scanned 9/11/2026
Install to Claude Code
Skills Directorynpx -y skills add oaknational/oak-open-curriculum-ecosystem --skill oak-complex-merge --agent claude-codeInstalls into .claude/skills of the current project.
Are you the author of Oak Complex Merge?
Add the live security badge to your README — it updates automatically with every re-scan.
[](https://www.skillsdirectory.com/skills/oaknational-oak-complex-merge-oak-open-curriculum-ecosystem)More formats (shields.io, HTML) on the badges page.
---
name: oak-complex-merge
description: Structured workflow for merging significantly diverged branches. Use when either branch has changed 100+ files, a dry-run merge produces 10+ conflicts, or the other branch refactored core interfaces your branch consumes.
---
# Complex Merge (Claude Code)
Read and follow `.agent/skills/complex-merge/SKILL-CANONICAL.md`.
Is this your skill, or is something wrong with this listing? Request removal or report an issue. Author removals are honored within 72 hours.
No comments yet. Be the first to comment!
