Loading skill
Install any skill in seconds. Free to start, no credit card required.
Get Started Free →mattpocock/resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Passed 8 of 16 test cases with the skill, and 10 of 16 without it.
and 2 more in the full report
3 fixed9 passed either way5 still failing6 broke
Tokens, turns and time describe resource use, not a dollar price.
One of 3 test cases the skill fixed. Same model, same prompt, with and without the skill.
I pulled changes from upstream and git output says `Automatic merge failed; fix conflicts and then commit the result.` What is the very first step I should take in `repo/analytics-engine` before editing any conflict markers?
| Checked | Without skill | With skill |
|---|---|---|
| Inspect git commit history to see current state. | Missed | Passed |
The instructions your model reads when the skill loads.
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.
test cases passed, vs 10 / 16 without
Published skills whose descriptions closely match this one, with their headline benchmark lift.
More skills from the same source and nearby in the registry, with their headline benchmark lift.