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.
Resolving Merge Conflicts
Use when resolving an in-progress git merge or rebase conflict.
Resolving Merge Conflicts by ForgeyClap · d47d98b
npx get-skill add forgeyclap/resolving-merge-conflicts File contents
---name: resolving-merge-conflictsdescription: "Use when resolving an in-progress git merge or rebase conflict."# W2-BUDGET original description (listing budget): "Use when you need to resolve an in-progress git merge/rebase conflict."license: MITmetadata: source: https://skillmd.com/skills/forgeyclap/resolving-merge-conflicts---<!-- Source: https://github.com/mattpocock/skills Pinned commit: c55ee46073ed923f86ce59a5eb3b6d895095d1b7 Upstream path: skills/engineering/resolving-merge-conflicts/ License: MIT (c) 2026 Matt Pocock -- full text in LICENSE next to this file Forge vendor note: frontmatter license: MIT key and this provenance block added; agents/openai.yaml (Codex UI metadata, no function in Claude Code) not shipped; everything else verbatim. Safety read: runs no destructive git -- it forbids aborting and finishes with a normal local commit or rebase continue; no push, reset, clean or branch deletion. Reviewed for prompt-injection patterns, hidden/zero-width/bidi/control unicode, network use and deletes by build-boss, 2026-09-24 -- clean; every upstream file sha256-verified against the pinned-commit manifest before copying.-->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. 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.
forgeyclap/claude-forge commit d47d98b4a0
Frequently asked questions
Run npx get-skill add forgeyclap/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 resolving an in-progress git merge or rebase conflict. It is listed under Coding & Dev Tools on SkillMD.
This skill has not completed SkillMD's automated safety review yet. Capability flags: makes network calls. 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. This skill is licensed under MIT.
ForgeyClap (@forgeyclap) published this skill. Their other Agent Skills are listed on their SkillMD profile.