-
See the current state of the merge/rebase. Check git history, and the conflicting files.
-
Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
-
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never
--abort. -
Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
-
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
global
New~216
v1.0Saved Jun 18, 2026
Files1
1 files · 1.0 KB
Select a file to preview
Overall Score
72/100
Grade
B
Good
Safety
88
Quality
68
Clarity
78
Completeness
60
Summary
This skill guides an AI agent through resolving git merge/rebase conflicts by examining the current state, understanding the intent behind conflicting changes, resolving each conflict hunk while preserving both intents where possible, running automated checks, and completing the merge/rebase. It emphasizes understanding the original context through commit messages, PRs, and issues rather than inventing new behavior.
Detected Capabilities
git status inspectionfile reading (conflicting files)git history inspection (commit messages)git merge/rebase operationstest and check executioncode formatting execution
Trigger Keywords
Phrases that MCP clients use to match this skill to user intent.
resolve merge conflicthandle rebase conflictfix conflicting changesmerge in progressrebase conflict resolution
Use Cases
- Resolve merge conflicts in an active merge operation
- Handle rebase conflicts while maintaining commit history
- Understand conflicting changes by reviewing commit context and PR discussions
- Validate that automated checks pass after conflict resolution
- Complete a partially-resolved merge or rebase workflow
Quality Notes
- Strengths: Clear step-by-step workflow with logical progression from understanding to resolution to validation. Explicitly discourages destructive workarounds (--abort). Emphasizes understanding intent before making changes, which is a best practice for conflict resolution.
- Strengths: Scope is well-defined — applies only to in-progress merge/rebase scenarios. No destructive file operations, no cross-project access, no credentials handling.
- Opportunity: The skill could benefit from concrete examples of how to identify and preserve conflicting intents (e.g., 'check if a variable rename in one branch conflicts with a logic change in another'). Currently relies on agent judgment.
- Opportunity: Could specify common automated checks more concretely (e.g., 'run npm test after resolution' for Node projects, or 'run pytest' for Python). Currently relies on agent discovering the correct checks.
- Opportunity: No guidance on handling 3-way conflicts or complex merge scenarios with multiple conflicting hunks. Instructions assume straightforward hunk-by-hunk resolution.
Model: claude-haiku-4-5-20251001Analyzed: Jun 18, 2026
Reviews
Add this skill to your library to leave a review.
No reviews yet
Be the first to share your experience.
Add mattpocock/resolving-merge-conflicts to your library and activate them in your IDE via the SkillRepo CLI.