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. If primary sources do not establish the intended result, stop and offer the recoverable
git merge --abortorgit rebase --abortpath rather than guessing.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 only the verified conflict-resolution files, show the resulting diff, and obtain user confirmation before committing or continuing the merge/rebase. If rebasing, continue until all commits are rebased only after that confirmation.
Fix Merge Conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
cogine-ai
Updated Fix Merge Conflicts by cogine-ai · 7e025db
npx skillmds@latest add cogine-ai/fix-merge-conflicts File contents
---name: fix-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, check original issues/tickets.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. If primary sources do not establish the intended result, stop and offer the recoverable `git merge --abort` or `git rebase --abort` path rather than guessing.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 only the verified conflict-resolution files, show the resulting diff, and obtain user confirmation before committing or continuing the merge/rebase. If rebasing, continue until all commits are rebased only after that confirmation.
cogine-ai/marketplace/tree/main/plugins/coding-engineer-skills/skills/fix-merge-conflicts commit 7e025dbfa8
Frequently asked questions
Run npx skillmds@latest add cogine-ai/fix-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.
cogine-ai (@cogine-ai) published this skill. Their other Agent Skills are listed on their SkillMD profile.