SkillMD SkillMD
light-dark-mode
Profile My skills Saved Collections Edit profile Submit a skill

Resolving Merge Conflicts

mattpocock/resolving-merge-conflicts · Agent Skill (multi-file)

by mattpocock · bundle

Published · Last updated

Use when you need to resolve an in-progress git merge/rebase conflict.

SKILL.md

  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.

Files

This skill is a package of 2 files. Install with the command above, or download the folder.

  • 📄SKILL.md entry
  • 📁agents
  • ◆openai.yaml GitHub 113 B
mattpocock/skills/tree/main/skills/engineering/resolving-merge-conflicts commit · 6654f6b60c

Related

  1. ▌
    Skill Creator · anthropic bundle
    Create new skills, modify existing ones, and measure their performance through iterative evaluation and benchmarking.
    158k
    repo stars
  2. ▌
    Code Reviewer · alirezarezvani bundle
    Automates code review for pull requests across 14+ languages, analyzing complexity, risk, code quality, and generating structured review reports.
    20.4k
    repo stars
  3. ▌
    Algorithmic Art · anthropic bundle
    Create algorithmic art by first writing a generative philosophy, then expressing it as p5.js sketches with seeded randomness and interactive parameter exploration.
    158k
    repo stars
  4. ▌
    Senior Backend · alirezarezvani bundle
    Designs and implements backend systems including REST APIs, microservices, database architectures, authentication flows, and security hardening. Covers Node.js/Express/Fastify development, PostgreSQL optimization, API security, and backend architecture patterns.
    20.4k
    repo stars
  5. ▌
    Game Engine · github bundle
    Build web-based games and game engines using HTML5 Canvas, WebGL, and JavaScript with frameworks like Phaser, Three.js, and Babylon.js.
    36.2k
    repo stars
  6. ▌
    Senior QA · alirezarezvani bundle
    Generates unit tests, integration tests, and E2E tests for React/Next.js applications by scanning components, analyzing coverage reports, and scaffolding Playwright test files.
    20.4k
    repo stars

Frequently asked questions

How do I install the Resolving Merge Conflicts skill?

Run npx skillmds add mattpocock/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.

What does the Resolving Merge Conflicts skill do?

Use when you need to resolve an in-progress git merge/rebase conflict. It is listed under Coding & Dev Tools on SkillMD.

Is Resolving Merge Conflicts safe to use?

This skill has not completed SkillMD's automated safety review yet. Capability flags: docs only. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.

Which AI agents work with Resolving Merge Conflicts?

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.

Is Resolving Merge Conflicts free to use?

Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.

Who published Resolving Merge Conflicts?

mattpocock (@mattpocock) published this skill. Their other Agent Skills are listed on their SkillMD profile.