with one click
oak-complex-merge
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.
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.