Loading skill
Install any skill in seconds. Free to start, no credit card required.
Get Started Free →fradser/resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
3 of 24 test cases passed with the skill.
Tokens, turns and time describe resource use, not a dollar price.
Lift withheld: 5 comparable cases; this report requires 8.
One of 2 test cases the skill fixed. Same model, same prompt, with and without the skill.
We resolved imports and formatting conflicts in `src/logger.ts`. What is the correct sequence of automated checks to run on the project before completing the merge?
| Checked | Without skill | With skill |
|---|---|---|
| Orders typecheck execution prior to running unit test suites. | Passed | Passed |
| Orders formatting checks after test suite completion. | 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.
Understand the original intent of each change before resolving it. Do not invent new behaviour; where intents conflict, pick the one matching the merge's stated goal and note the trade-off. 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 with the skill
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.