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 fetch any specs behind each change — the fetch-spec verb. The loop config translates the storage verbs: it is
docs/agents/cantrips-loop.md, and when that doc is absent the plugin defaults (defaults.md) govern. A backend that keeps specs out of the repo may hold none for the incoming side: when a spec is out of reach, work from the commits and the PR and say which side's intent you had to infer.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.
toverux
Updated Resolving Merge Conflicts by toverux · 56d7862
npx skillmds@latest add toverux/resolving-merge-conflicts File contents
---name: resolving-merge-conflictsdescription: Use when you need to resolve an in-progress git merge/rebase conflict.---1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.2. **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 fetch any specs behind each change — the fetch-spec verb. The loop config translates the storage verbs: it is `docs/agents/cantrips-loop.md`, and when that doc is absent the plugin defaults ([defaults.md](../setup-cantrips-loop/defaults.md)) govern. A backend that keeps specs out of the repo may hold none for the incoming side: when a spec is out of reach, work from the commits and the PR and say which side's intent you had to infer.3. **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`.4. Discover the project's **automated checks** and run them — typically typecheck, then tests, then format. Fix anything the merge broke.5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
toverux/cantrips/tree/main/skills/resolving-merge-conflicts commit 56d78623dd
Frequently asked questions
Run npx skillmds@latest add toverux/resolving-merge-conflicts in your terminal (requires Node.js), paste this page's agent-chat prompt into Claude, Cursor, or any MCP-connected agent, or download the SKILL.md file and copy it into your agent's skills directory.
Use when you need to resolve an in-progress git merge/rebase conflict. It is listed under Coding & Dev Tools on SkillMD.
This skill has not completed SkillMD's automated safety review yet. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.
This skill is tagged as working with Claude Code, Claude.ai, OpenAI Codex. SKILL.md is an open format, so most agents that read a skills directory can load it too.
Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.
toverux (@toverux) published this skill. Their other Agent Skills are listed on their SkillMD profile.