-
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.
NewUpdated Sep 9, 2026
Files2
2 files · 1.2 KB
Select a file to preview
Overall Score
72/100
Grade
B
Good
Grades are signals, not a certification. Always review a skill yourself before use.
Safety
78
Quality
68
Clarity
78
Completeness
62
Summary
This skill guides an agent through resolving git merge and rebase conflicts by examining the conflict context, understanding the original intents, manually resolving each hunk, running automated checks (typecheck, tests, format), and completing the merge/rebase operation. It emphasizes preserving both intents where compatible and grounding resolutions in the merge's stated goal.
Detected Capabilities
git operationsfile readshell executionprocess execution
Trigger Keywords
Phrases that agents use to match this skill to user intent.
resolve merge conflictsfix rebase conflictsmerge conflict resolutiongit merge conflictscomplete rebase
Risk Signals
INFO
Shell command execution for automated checks (typecheck, tests, format)
Step 4
INFO
Git merge/rebase continuation commands
Step 5
INFO
File modification through conflict resolution
Step 3
Use Cases
- Resolve merge conflicts during PR integration by examining commit messages and original issues
- Complete a rebase operation by thoughtfully reconciling conflicting code changes
- Debug broken tests or type errors introduced by merge conflicts
- Preserve multiple code intentions when both sides of a conflict are valid
- Finish interrupted merge/rebase operations with automated checks
Quality Notes
- Skill provides clear sequential steps for a specific workflow (merge/rebase conflict resolution)
- Instructions emphasize understanding intent and avoiding invention of behavior — good guidance for code decisions
- No explicit error handling or edge case coverage documented (e.g., what if automated checks fail, what if conflicts cannot be resolved)
- Lacks concrete examples of conflict resolution patterns or common scenarios
- Does not document project-specific automated check patterns — assumes agent will discover them
- No guidance on when to abandon a merge/rebase (only states 'never --abort', which is prescriptive but not universally true)
- Supporting YAML file confirms display name and short description but provides no additional context or tool configuration
Model: claude-haiku-4-5-20251001Analyzed: Sep 9, 2026
Reviews
Add this skill to your library to leave a review.
No reviews yet
Be the first to share your experience.
Version History
- v1.1LATEST
Content updated
✦ AIRemoves bold formatting from automated checks example in step 4.
2026-09-09
Use mattpocock/resolving-merge-conflicts in your dev environment — a Developer account adds skills to your library and syncs them via the SkillRepo CLI.