Resolve merge conflicts between a pull request and production changes in the cloudflare-docs repository.
How to install rebase-conflict?
cloudflare/cloudflare-docs/rebase-conflict
$npx -y skills add cloudflare/cloudflare-docs --skill rebase-conflictInstalls into the current project.
›Prefer a prompt? Paste this to your agent
Run `npx skills use "https://github.com/cloudflare/cloudflare-docs" --skill "cloudflare/cloudflare-docs/rebase-conflict"` and follow the generated skill instructions now. Read its complete output, redirecting it to a temporary file first if necessary. Resolve relative paths from the supporting-files directory it provides.
Use the skills in "https://github.com/cloudflare/cloudflare-docs" that are relevant to the current task. Run `npx skills add "https://github.com/cloudflare/cloudflare-docs"` and select the relevant skills, then follow their instructions.
Related
6 picksType
- improve-codebase-architectureScan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick.Jul 2026
- domain-modelingBuild and sharpen a project's domain model. Use when the user wants to pin down domain terminology or a ubiquitous language, record an architectural decision,…Jul 2026
- caveman-reviewUltra-compressed code review comments. Cuts noise from PR feedback while preserving the actionable signal. Each comment is one line: location, problem, fix.Jul 2026
- codebase-designShared vocabulary for designing deep modules. Use when the user wants to design or improve a module's interface, find deepening opportunities, decide where a…Jul 2026
- code-reviewReview the changes since a fixed point (commit, branch, tag, or merge-base) along two axes — Standards (does the code follow this repo's documented coding…Jul 2026
- resolving-merge-conflictsUse when you need to resolve an in-progress git merge/rebase conflict.Jul 2026
