Menu
Systematic workflow for solving complex merge and rebase conflicts without losing work.
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.
Based on SOC occupation classification
Technical workflow for verifying compliance with WCAG 2.2 accessibility standards.
Specialist security audit workflow focused on bypasses, creative injections, and logical flaws.
Procedural guide and automated facilitator for daily standups, sprint planning, and retrospectives.
Workflow for ensuring the documentation (OpenAPI/Swagger) always reflects reality.
Strategic workflow for analyzing and optimizing the business value and monetization of APIs.
Rapid scaffolding for new API endpoints following project-specific standards.
| name | drin-git-rebase-conflict-solver |
| description | Systematic workflow for solving complex merge and rebase conflicts without losing work. |
| status | production |
To maintain a clean git history while ensuring code integrity during complex merges.
git rebase --abort. Create a backup branch.git rebase [target].<<<<<<< markers.git add . and git rebase --continue.-f (force) on shared branches without team sync.