Code Review & Testing · IN-DEPTH PROFILE

Resolving Merge Conflicts Skill

Resolving Merge Conflicts is a narrow workflow for an already-in-progress Git merge or rebase.

View listed source ↗Installation guide ↓
Best for

Developers resolving a merge or rebase

What you get

Understand the in-progress operation + Resolve by original intent

Main limitation

It is intended only for a merge or rebase already in progress, not as a general repository cleanup or reset workflow.

First risk

Finishing a conflict resolution incorrectly. A mistaken resolution can discard intended behavior, and the workflow's strong default is to finish rather than abort. Confirm the operation's goal, keep a recovery point, and review the complete diff before committing.

EVIDENCE FRESHNESS

Three checks, kept separate

A recent source check is not a runtime test or security audit.

Upstream sourceChecked 2026-09-23

Pinned revision · c55ee460

Open pinned commit ↗
SkillSignal profileSource-grounded

Updated 2026-08-20

Runtime & securityNot independently verified

Source review does not certify behavior or safety.

IN PLAIN ENGLISH

What it does—and when it fits

Resolving Merge Conflicts is a narrow workflow for an already-in-progress Git merge or rebase. It investigates each side's original intent, preserves compatible changes, resolves incompatible hunks against the stated goal, then runs project checks and finishes the operation.

This is aimed at Developers resolving a merge or rebase. Compare the examples below with your task, then review the limitations, permissions, and risks before installing.

What you get
  • Understand the in-progress operationInspect repository state, history, and files with conflicts.
  • Resolve by original intentUse commit messages, pull requests, and issues to avoid inventing new behavior.
  • Verify the resultRun the project's automated checks before completing the merge or rebase.
What makes it different
  • This profile is manually organized around the current upstream SKILL.md workflow.
  • The capability boundary remains explicitly tied to mattpocock/skills.
  • Core uses, limitations, and risks are separated for pre-install review.
Community signalskills.sh All-time: #81 · 544.9K installs

No verified review text is in the current dataset. Use the linked source for the latest discussion.

Read the source note ↗

INSTALL BY AGENT

Choose your Agent

Paths come from official Agent docs or the universal installer behind skills.sh. Compatibility still follows this Skill's record.

Native

This Skill's current record explicitly names this Agent. Still inspect scripts, permissions, and external dependencies first.

Project install (recommended)
npx skills add https://github.com/mattpocock/skills --skill resolving-merge-conflicts --agent claude-code
Personal install
npx skills add https://github.com/mattpocock/skills --skill resolving-merge-conflicts --agent claude-code -g

Project install stays with this repository for team sharing. Personal install adds -g and works across repositories.

View install paths
Project path.claude/skills/resolving-merge-conflicts/
Personal path~/.claude/skills/resolving-merge-conflicts/
Official agent docs

Claude Code discovers custom Skill folders automatically at project or personal scope.

View path evidence ↗

TYPICAL WORKFLOW

A practical workflow

01

Understand the in-progress operation

Inspect repository state, history, and files with conflicts.

02

Resolve by original intent

Use commit messages, pull requests, and issues to avoid inventing new behavior.

03

Verify the result

Run the project's automated checks before completing the merge or rebase.

THE TRADEOFFS

Advantages and tradeoffs

Notable strengths

  1. This profile is manually organized around the current upstream SKILL.md workflow.
  2. The capability boundary remains explicitly tied to mattpocock/skills.
  3. Core uses, limitations, and risks are separated for pre-install review.

Limitations

  1. It is intended only for a merge or rebase already in progress, not as a general repository cleanup or reset workflow.
  2. It needs recoverable source context and working project checks; ambiguous or incompatible intent may require a user decision.

COMPARE THE TRADEOFF

Consider these close alternatives

These are deterministic nearby candidates, not paid placements or a universal ranking. Open the full profile before choosing.

01

Same job family · native to Claude Code + Codex

frontend-design

Design constraints that push generated interfaces beyond generic AI UI.
Tradeoff to check
Aesthetic judgments remain subjective and still need stakeholder review.
First risk
Style over function · Medium
Source state
Pinned · 34040c9c
Open frontend-design profile ↗
02

Same job family · native to Codex + Claude Code

web-design-guidelines

Review interfaces against practical web design and accessibility rules.
Tradeoff to check
It depends on network access and a live guideline document whose contents can change over time.
First risk
Rule drift or context-free findings · Medium
Source state
Pinned · 063bee94
Open web-design-guidelines profile ↗
03

Same job family · native to Codex + Claude Code

anti-ui-slop

Instruction-only, product-specific UI design contracts with optional real-interface evidence and a hard finish gate.
Tradeoff to check
Repository evidence is required; UIZZE references or user-provided screenshots are optional, and missing reference evidence should be labeled rather than guessed.
First risk
Copying external interface patterns too literally · Medium
Source state
Pinned · 1f564408
Open anti-ui-slop profile ↗
Compare more in the directory →

BEST FIT

Who it is for

→

Developers resolving a merge or rebase

→

Teams preserving intent across concurrent changes

BEFORE YOU USE IT

Risks to review before use

High

Finishing a conflict resolution incorrectly

A mistaken resolution can discard intended behavior, and the workflow's strong default is to finish rather than abort. Confirm the operation's goal, keep a recovery point, and review the complete diff before committing.

Medium

Upstream instruction drift

Behavior can change with upstream updates. Record the commit used for important workflows and review updates before adoption.

SECURITY

What the permission profile means

  • Declared access remains governed by the current upstream SKILL.md and runtime requests.
  • Treat repository files, web content, and tool output as untrusted input.
  • SkillSignal has not independently executed or security-audited this package; external skills.sh labels are not SkillSignal certification.

Not a security certification. External ratings are attributed references. SkillSignal has not independently executed or security-reviewed this Skill.

COMMON QUESTIONS

Resolving Merge Conflicts Skill FAQ

What is the Resolving Merge Conflicts Skill?

Resolving Merge Conflicts is a narrow workflow for an already-in-progress Git merge or rebase. It investigates each side's original intent, preserves compatible changes, resolves incompatible hunks against the stated goal, then runs project checks and finishes the operation.

How do I install the Resolving Merge Conflicts Skill?

Open and review the listed source, choose the project or personal path for your Agent, then verify the first run in a controlled project. Open the listed skills.sh page and upstream repository; verify the current SKILL.md.

Is the Resolving Merge Conflicts Skill safe to use?

SkillSignal checked the source on 2026-09-23, but that is not a runtime test or security certification. Review the “Finishing a conflict resolution incorrectly” risk first and begin with the least access required.

INSIDE THE PACKAGE

Indexed files

SKILL.mdUpstream Skill instructionsSource-linked

TAGS

gitmerge-conflictsrebase

Manually expanded from the current upstream SKILL.md and linked source at mattpocock/skills, checked 2026-08-20. This is an original summary, not an execution result or security certification.