KairaxisKairaxis
Freetooling skillhigh risk

Capability · rank 24

resolving-merge-conflicts

Investigate both sides of a conflict, resolve every hunk, validate the result, and finish the merge or rebase.

A source-driven merge and rebase workflow that traces intent, resolves conflicts, runs project checks, and completes the Git operation.

Listed owner

mattpocock/skills

Package source

GitHub

Category

Developer Exp

Developer Exp
$npx skills add https://github.com/mattpocock/skills --skill resolving-merge-conflicts
OverviewSandboxUsageExamplesLimitationsVersionsRelated Skills

Overview

A source-driven merge and rebase workflow that traces intent, resolves conflicts, runs project checks, and completes the Git operation. Review the sandbox comparison, limitations, permissions, and pinned version before install.

Outcome

Investigate both sides of a conflict, resolve every hunk, validate the result, and finish the merge or rebase.

Who it is for

Developers resolving non-trivial merge or rebase conflicts in active repositories.

What it is not for

Automated conflict resolution without a clean backup or maintainer oversight.

Runtime export

codex_skill · markdown_export

Sandbox comparison
Generic baseline vs resolving-merge-conflicts on the same sample input · pinned v0.1.0

Sample input

Resolve this rebase conflict and validate both branches' intended behavior

Model: gpt-4.1-mini · temp 0.2

Generic baseline

50/100
Use a generic workflow and rely on broad best practices without domain-specific guidance.

Skill-enhanced

86/100
resolving-merge-conflicts workflow:
Investigate both sides of a conflict, resolve every hunk, validate the result, and finish the merge or rebase.
Apply the capability with explicit assumptions, constraints, and a reviewable result.

Rubric scores

+36 lift
Coverage of failure modes2 → 5
Actionable recommendations3 → 5
Measurable next steps2 → 4
Risk / limitation awareness2 → 4

Assumptions

  • Sample input is representative of a real production task
  • Same model and temperature for baseline and skill-enhanced runs

Comparison runs through the shared sandbox engine on registry sample cases (deterministic v0 path).

Usage

  1. 1. Inspect trust badges, limitations, and permissions on this page.
  2. 2. Run the sandbox comparison to see baseline vs skill-enhanced output.
  3. 3. Install the pinned version with the command below for your agent runtime.
  4. 4. Agents can also fetch /api/v1/skills/resolving-merge-conflicts/manifest.
$npx skills add https://github.com/mattpocock/skills --skill resolving-merge-conflicts

Example prompts & use cases

1 / Prompt

Resolve this rebase conflict and validate both branches' intended behavior

Limitations

  • Intent can remain ambiguous when issue and commit history are incomplete.

Audience

Developers resolving non-trivial merge or rebase conflicts in active repositories.

Not for

Automated conflict resolution without a clean backup or maintainer oversight.

Version history

v0.1.0

Jul 22, 2026current

Initial Kairaxis catalog packaging