Resolving merge conflicts
🤖 Curated agent skills for AI agents — one coherent engineering loop that compounds: grill → spec → implement → review → commit → learn. Adopt it or fork it!
npx -y skills add toverux/grimoire --skill resolving-merge-conflictsAssembled from the repository path, not quoted from the project. Check it against their README if it does not work.
2 things to look at
- 28 days oldThe repository was created 28 days ago. New is not bad, but a brand new repository carrying a familiar-sounding name is the shape a typosquat arrives in, and there has been no time for anyone else to find a problem with it.
- 1 stars1 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.
What its author says it does
Copied from the file, not written here
Use when you need to resolve an in-progress git merge/rebase conflict.
SKILL.md
1.0 KB, 197 tokens by cl100k_base, as published. Nobody here has run it
-
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, and check any specs in
docs/specs/behind each change. -
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.
What ships with it: 1 file
164 B alongside SKILL.md
agents/
- openai.yaml164 B