resolving-merge-conflicts · Skill Details

Mechanism

When It Triggers · How It Works · What It Produces

Breaks down how the skill works and what it produces, so you can quickly judge whether it fits your scenario and value.

Trigger: User-invoked when encountering conflicts during git merge or rebase. Common in collaborative scenarios, automatically recommended by the agent when conflict state is detected.
Mechanism: A 5-step process: (1) check conflict state (git history and conflicted files); (2) find primary sources for each conflict (commit messages, PRs, issues) to understand original intent on both sides; (3) resolve each hunk preserving both intents where possible, choosing by merge goal only when incompatible, never inventing new behaviour; (4) run project's automated checks (typechecking, tests, formatting); (5) complete the merge/rebase. Core principle: never --abort.
Output: Successfully completed merge/rebase with all conflicts resolved, project checks passed, and changes committed.

Use Cases

Two Typical Use Cases

Scenario 01

Resolving merge conflicts from parallel development

Two team members modified different parts of the same module in parallel, causing merge conflicts. A developer invokes `/resolving-merge-conflicts`. The skill first checks git history to identify conflicted files, reads both sides' commit messages and related issues/PRs to understand original intent, then resolves each hunk. If one change is a bugfix and the other a feature, the bugfix takes priority. After resolution, it runs the typechecker and test suite, then completes the commit.

Scenario 02

Conflicts during a git rebase

A developer encounters conflicts while rebasing a feature branch onto the latest main. Invoking `/resolving-merge-conflicts`, the skill detects a rebase in progress, identifies original intents behind each conflict's commits, resolves each hunk, then continues through `git rebase --continue` until the entire process completes. The final rebased branch passes CI checks.

Skill Relationships

Which Skills I Use · Which Skills Use Me

Dependency relationships read as "the upper tier points to the lower tier." The current Skill sits in the middle tier — above are Skills that depend on it, below are Skills it depends on.

Tier 1 · These Skills Use Me

No explicit dependency

Tier 2 · Current Skill

resolving-merge-conflictsWorkflow

Tier 3 · I Use These Skills

No explicit dependency on other Skills

Full Relationship Graph

Browse this skill's relationships within its skillset. Click a node to switch the side panel; use the search box to jump to any skill.

Skill File

SKILL.md

Open in GitHub ↗

SKILL.mdLoading from GitHub…

Skill Composition

Open in GitHub ↗

SKILL.md50.0%
other50.0%

▸skills/resolving-merge-conflicts/
▸resolving-merge-conflicts
- ·SKILL.md
- ▸agents
  - ·openai.yaml

Per the Agent Skills spec, SKILL.md is the only required file. The colored bars classify the rest into the three spec-aligned optional directories (scripts / references / assets) and an 'other' bucket. The full directory tree is below.

Related in Skillset

You May Also Need These Skills

ask-matt

A router skill for the entire skillset: when the user can't remember which skill to use or which flow fits their situation, they invoke this to get a recommendation. It describes the main "idea → ship" flow (grill-with-docs → to-spec/to-tickets → implement), plus on-ramps (triage, diagnosing-bugs, wayfinder), codebase health (improve-codebase-architecture), vocabulary layers (domain-modeling, codebase-design), and standalone skills (grill-me, prototype, research, teach). Following its map leads users to the correct workflow entry point.

Workflow

code-review

A two-axis code review skill: reviews a diff (from a fixed point to HEAD) along both Standards (coding standards + Fowler smell baseline) and Spec (faithful implementation of the originating issue/PRD). Both axes run as parallel sub-agents to avoid context pollution. The report aggregates findings without merging conclusions, ensuring "passes standards but implements the wrong thing" and "implements the right thing but breaks conventions" are both surfaced independently.

Workflow

codebase-design

A shared vocabulary skill for deep module design: provides a precise set of design terms (Module, Interface, Depth, Seam, Adapter, Leverage, Locality) guiding agents and developers to design "deep modules" — a lot of behaviour behind a small interface. Includes design principles (the deletion test, the interface is the test surface) and testability guidelines. A reference skill consumed by other skills (e.g., improve-codebase-architecture, tdd) and invoked directly by engineers.

Style Guide

diagnosing-bugs

A disciplined diagnosis loop for hard bugs and performance regressions. The core idea is to first build a tight feedback loop — no hypothesis phase without one. Six phases: build feedback loop → reproduce + minimise → generate 3-5 falsifiable hypotheses → instrument by prediction → fix + regression test → cleanup + post-mortem. If the codebase architecture can't lock down the bug, it recommends handing off to the improve-codebase-architecture skill.

Workflow