القائمة
Resolves git merge conflicts by analyzing intent from both sides. Use when merge conflicts are detected or when git operations fail with conflict errors.
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
Traces code history via git blame and log to explain why code exists in its current form. Use when asked about code history, reasoning behind changes, or "when/why did this change".
Commit changes with smart messages. Supports full and partial commits. Use whenever committing changes or handling pre-commit hook failures.
Use the gh CLI for GitHub interactions, plus setup and pushing. Use when interacting with GitHub, setting up GitHub tools, or pushing to remote.
Universal polyglot linting and per-project config management. Use when you need to lint files, understand tool selection logic, invoke linting from commands/agents, or manage mr-sparkle config.
Create a pull request with Problem/Solution format. Can optionally commit first. Use when opening PRs or when branch changes are ready for review.
User's README style preferences — ultra-terse, action-focused, <50 lines. Use when writing or reviewing any README file.
| name | merge-conflicts |
| description | Resolves git merge conflicts by analyzing intent from both sides. Use when merge conflicts are detected or when git operations fail with conflict errors. |
Detect conflicted files: git status — look for "both modified" / "both added"
For each conflicted file:
Read and understand intent:
git log -p --follow -- path/to/file to see recent historygit blame path/to/file to understand why each side made changesClassify and resolve:
Compatible changes (different additions, merged imports) → auto-resolve, keep both
import { A, B } vs import { A, C } → import { A, B, C }Overlapping changes (same logic modified differently) → combine if possible, explain reasoning
Incompatible changes (mutually exclusive) → do NOT auto-resolve
Apply resolution:
git add path/to/fileReport per file:
File: path/to/file
Strategy: Compatible / Overlapping / Incompatible
Reasoning:
- HEAD: <what it was trying to do>
- Incoming: <what it was trying to do>
- Resolution: <how both intents were preserved>
Confidence: High / Medium / Low
Status: Auto-resolved / Needs review
Provide next steps:
git commit or git merge --continuegit merge --abort or git rebase --abort