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.
Installs 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 with every re-scan.
[](https://www.skillsdirectory.com/skills/oaknational-oak-complex-merge)
---
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 (Cross-tool)
Read and follow `.agent/skills/complex-merge/SKILL-CANONICAL.md`.
