Loading skill
Install any skill in seconds. Free to start, no credit card required.
Get Started Free →sickn33/resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
Passed 16 of 19 test cases with the skill, and 12 of 19 without it.
and 2 more in the full report
4 fixed14 passed either way4 still failing0 broke
Tokens, turns and time describe resource use, not a dollar price.
One of 4 test cases the skill fixed. Same model, same prompt, with and without the skill.
We have TypeScript typechecking, Jest tests, and Prettier formatting configured in `package.json`. In what sequence should we run automated checks after resolving conflicts in `src/app.ts`?
| Checked | Without skill | With skill |
|---|---|---|
| Specifies running typecheck before unit tests | Passed | Passed |
| Specifies running formatting checks after unit tests | Missed | Passed |
The instructions your model reads when the skill loads.
Use when you need to resolve an in-progress git merge/rebase conflict.
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 12 / 19 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.