FreeSkillHigh riskv0.1.0

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.

Developer Exp #git #merge #rebase #conflicts

Browse topics and task labels

Prompt or reference Build Edit Redesign Critique Design Review Text

Publisher: mattpocock/skills
Source: GitHub
Category: Developer Exp

Overview

Who it is for: Developers resolving non-trivial merge or rebase conflicts in active repositories.
Not intended for: Automated conflict resolution without a clean backup or maintainer oversight.
Export formats: codex_skill, markdown_export

Sandbox comparison

Generic baseline vs resolving-merge-conflicts on the same input, pinned to v0.1.0.

Sample input

gpt-4.1-mini · temp 0.2

Resolve this rebase conflict and validate both branches' intended behavior

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

+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

Runs on registry sample cases through the shared, deterministic sandbox engine.

Usage

01Review the quality signals, limitations, and permissions on this page.
02Inspect upstream content and license before loading a package.
03Apply relevant guidance within your requested scope and verify the result.
04Agents can also read the machine-readable contract at /api/v1/skills/resolving-merge-conflicts/manifest.

npx skills add https://github.com/mattpocock/skills --skill resolving-merge-conflicts

Example prompts

Requests that put this skill to work.

Resolve this rebase conflict and validate both branches' intended behavior

Limitations

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

Version history

v0.1.0CurrentJul 22, 2026
Initial Kairaxis catalog packaging

At a glance

Upstream installs: 139.5K
24-hour installs: 7.0K
Evaluation: Registry example only
Last updated: Jul 22, 2026
Version: 0.1.0

Evidence

Source metadata and registry examples. Content and outcome quality require review.

Package validated
Benchmark tested
Taste calibrated
Creator reviewed

Permissions

Read filesRequired
Write filesRequired
Web accessNot needed
API accessNot needed
MCP accessNot needed
Code executionRequired
External actionsNot needed

Environment fit

Runtime compatibility has not been verified.

Resources

Own this skill?

It is listed under mattpocock/skills. Claim it to manage the listing after review.

False claims may result in permanent bans. Ownership transfer is never automatic.

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.

Publisher

mattpocock/skills

Source

GitHub

Overview

Generic baseline

Skill-enhanced

Rubric

Assumptions

Usage

Example prompts

Limitations

Version history

Related skills

grill-me

tdd

improve-codebase-architecture

Overview

Generic baseline

Skill-enhanced

Rubric

Assumptions

Usage

Example prompts

Limitations

Version history

Related skills

grill-me

tdd

improve-codebase-architecture