drin-git-rebase-conflict-solver
Systematic workflow for solving complex merge and rebase conflicts without losing work.
用 Codex 或 Claude 帮你安装 复制这段 Prompt,粘贴到 Codex、Claude 或其他助手里,让它检查 Skill 页面并帮你完成安装。
菜单
Systematic workflow for solving complex merge and rebase conflicts without losing work.
用 Codex 或 Claude 帮你安装 复制这段 Prompt,粘贴到 Codex、Claude 或其他助手里,让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
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.