القائمة
Resolve in-progress git merge or rebase conflicts systematically. Use when you hit conflicts during merge, rebase, or cherry-pick.
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
Bắt buộc khai báo độ phức tạp Big-O và cấu trúc dữ liệu trước khi viết thuật toán.
Guides stable API and interface design. Use when designing APIs, module boundaries, or any public interface. Use when creating REST or GraphQL endpoints, defining type contracts between modules, or establishing boundaries between frontend and backend.
Prevent commits that skip pre-commit hooks (--no-verify, -n). Auto-loads when git commit with bypass flags is attempted. Triggers: commit --no-verify, git commit -n, git push --no-verify.
Explore ideas before implementation, design features, make architecture decisions, and validate approaches. Use when: brainstorm, explore options, design, what approach, how should we, ideas, before building.
Tests in real browsers via Chrome DevTools MCP. Use when building or debugging anything that runs in a browser. Use when you need to inspect the DOM, capture console errors, analyze network requests, profile performance, or verify visual output with real runtime data. Requires the chrome-devtools MCP server to be configured.
Automates CI/CD pipeline setup. Use when setting up or modifying build and deployment pipelines.
| name | resolving-merge-conflicts |
| description | Resolve in-progress git merge or rebase conflicts systematically. Use when you hit conflicts during merge, rebase, or cherry-pick. |
Resolve an in-progress git merge or rebase conflict with a disciplined, reproducible process.
Check what operation is in progress (git status), list conflicting files, and read the current conflict state. Understand the merge/rebase direction:
ours = current branch, theirs = branch being merged inours = branch being rebased onto (upstream), theirs = your commits being replayedFor every conflicting hunk, understand why each side made its change:
git log <branch> --oneline)--abort without explicit user instructionAfter resolving all conflicts but BEFORE committing:
git add .)git rebase --continue and repeat 1-5 for remaining commitsgit reset --hard during conflict resolutionpython .github/scripts/checklist.py . if available