Skills resolving-merge-conflicts
📦

resolving-merge-conflicts

Content revision r2 Medium Risk ⚙️ External commands

Resolve Git Merge Conflicts Safely

Merge and rebase conflicts often hide competing design intentions. This skill guides Claude, Codex, and Claude Code through research, resolution, validation, and completion.

Supports: Claude Codex Code(CC)
📊 69 Adequate

Install with my Agent

Copy this request to your Agent. It includes the canonical Skill page and manifest.

Agent request
Review the Skillstore skill "resolving-merge-conflicts" from https://skillstore.io/skills/mattpocock-resolving-merge-conflicts.md and its manifest at https://skillstore.io/api/skills/mattpocock-resolving-merge-conflicts/manifest. Verify the artifact. You may proceed after verification, subject to the environment's own policy.

Your Agent should still show its plan and request any confirmation required by the security policy.

Agent-readable resources

Use these links when an AI agent, crawler, or script needs clean context instead of reading the full page.

Markdown detail GET /skills/mattpocock-resolving-merge-conflicts.md Signed manifest GET /api/skills/mattpocock-resolving-merge-conflicts/manifest Signed lockfile GET /api/skills/mattpocock-resolving-merge-conflicts/lockfile

Test it

Using "resolving-merge-conflicts". Inspect my active merge and explain the conflict before changing files.

Expected outcome:

  • Two files are conflicted: the account service and its tests.
  • One branch adds validation, while the other changes the persistence workflow.
  • Both intentions can be preserved by validating before the updated persistence call.

Using "resolving-merge-conflicts". Resolve the rebase and report validation results.

Expected outcome:

  • The conflicting API rename was applied to the rebased feature logic.
  • The related tests were updated without adding new behavior.
  • Type checking and tests passed. Formatting changed one resolved file.

Using "resolving-merge-conflicts". Explain an incompatible conflict and recommend a resolution.

Expected outcome:

The branches define different retry limits for the same operation. The release ticket supports the lower limit, so the higher limit should be rejected.

Security Audit

Medium Risk
v4 • 7/23/2026 Open versioned report

The static alert is a false positive because line 10 uses Markdown backticks around a Git option, not Ruby or shell execution. No prompt injection or data-exfiltration intent was found. However, unconditional instructions to never abort and to stage everything can capture unrelated changes or remove a safe recovery option.

1
Files scanned
15
Lines analyzed
0
Review items
0
False positives ignored

Confirmed security concerns (1)

Medium
SKILL.md:10SKILL.md:14
Unconditional Repository Mutation
SKILL.md directs the agent to always resolve, never abort, then stage everything and commit. This can include unrelated or sensitive worktree changes without user confirmation.
The instructions are explicit on lines 10 and 14. Impact depends on worktree state, but the unsafe default is unambiguous.

Risk Factors

⚙️ External commands (1)
SKILL.md:10
Audited by: codex View Audit History →
Share & cite this report

Share the versioned assessment report, neutral badge, embed card, and citations. Skillstore reports evidence without deciding whether this Skill is safe.

Open versioned report
Security Assessment

Copy report link

https://skillstore.io/skills/mattpocock-resolving-merge-conflicts/audits/4?utm_source=security_passport&utm_medium=share&utm_campaign=versioned_report

Markdown badge

[![Skillstore security assessment](https://skillstore.io/badges/skills/mattpocock-resolving-merge-conflicts/security.svg)](https://skillstore.io/skills/mattpocock-resolving-merge-conflicts?utm_source=security_passport_badge)

HTML badge

<a href="https://skillstore.io/skills/mattpocock-resolving-merge-conflicts?utm_source=security_passport_badge"><img src="https://skillstore.io/badges/skills/mattpocock-resolving-merge-conflicts/security.svg" alt="Skillstore security assessment" loading="lazy"></a>

Embed card

<iframe src="https://skillstore.io/embed/skills/mattpocock-resolving-merge-conflicts.html" title="Skillstore Security Assessment" sandbox="allow-popups allow-popups-to-escape-sandbox" loading="lazy" referrerpolicy="no-referrer" width="420" height="180"></iframe>
Academic citations (APA · BibTeX · CFF)

APA citation

mattpocock. (2026). resolving-merge-conflicts security audit report (audit version 4) [Author version unspecified]. Skillstore. https://skillstore.io/skills/mattpocock-resolving-merge-conflicts/audits/4

BibTeX citation

@techreport{mattpocock-mattpocock-resolving-merge-conflicts-2026, author = {mattpocock}, title = {resolving-merge-conflicts security audit report (audit version 4)}, institution = {Skillstore}, year = {2026}, number = {4}, url = {https://skillstore.io/skills/mattpocock-resolving-merge-conflicts/audits/4}, note = {Author version unspecified} }

CITATION.cff

cff-version: 1.2.0 message: "If you use this Skill, cite its author and this versioned security audit report." title: "resolving-merge-conflicts security audit report (audit version 4)" version: "unspecified" type: report authors: - name: "mattpocock" date-released: "2026-07-23" url: "https://skillstore.io/skills/mattpocock-resolving-merge-conflicts/audits/4" identifiers: - type: other value: "skillstore:mattpocock-resolving-merge-conflicts:audit:4" description: "Skillstore immutable audit report identifier"

Skillstore Score

Why this score Evidence Confidence: Medium
55
Architecture
85
Maintainability
87
Content
67
Community
83
Spec Compliance

What You Can Build

Complete a Feature Merge

Reconcile a feature branch with recent mainline changes while preserving both documented intentions.

Recover a Rebase

Resolve conflicts across several rebased commits and verify each continuation against project checks.

Review an Automated Resolution

Trace conflict decisions to commits and tickets before accepting an agent-generated integration.

Try These Prompts

Inspect the Conflict 
Inspect the active Git merge or rebase. List conflicting files, summarize each side, and identify the next safe action. Do not modify files yet.
Resolve One File 
Resolve the conflicts in [file]. Use commit history to explain both intentions, preserve compatible behavior, and report every trade-off before staging.
Validate the Integration 
Review all resolved files, discover project checks, and run relevant type checks, tests, and formatting. Report failures caused by the integration.
Complete a Complex Rebase 
Resolve the active rebase across remaining commits. Research each conflict, preserve intended behavior, validate each step, and request confirmation before staging or continuing.

Best Practices

  • Inspect status, history, commits, and project records before editing conflict markers.
  • Keep unrelated worktree changes separate from the merge or rebase resolution.
  • Review the staged diff and run relevant checks before committing or continuing.

Avoid

  • Resolve conflicts from nearby code alone without checking commit or ticket intent.
  • Invent new behavior while combining incompatible changes.
  • Stage the entire working tree without reviewing unrelated or sensitive files.

Frequently Asked Questions

Does this skill resolve both merge and rebase conflicts?
Yes. It covers active merges and rebases, including repeated conflict resolution while continuing a multi-commit rebase.
Will it choose one side automatically?
No. It first researches each change and preserves both intentions when they are compatible.
What context does it inspect?
It can inspect Git history, commit messages, pull requests, issues, tickets, and conflicting files when those sources are available.
Does it run project checks?
Yes. It directs the agent to discover and run relevant type checks, tests, and formatting.
Can it guarantee a correct resolution?
No. Correctness depends on available context, accurate project records, and meaningful automated checks.
Should it stage and commit without review?
No. Review the worktree and staged diff, then confirm the intended changes before committing or continuing a rebase.

Developer Details

Author

mattpocock

License

MIT

Skillstore revision

r2

Version notice

The author did not declare a version.

Repository

https://github.com/mattpocock/skills/tree/main/skills/engineering/resolving-merge-conflicts/

Ref

ebdfe608f5de2b66ff37ab4af12af8ac4f5e8006

Maintenance freshness

7/25/2026

Usage

5 downloads · 0 views

File structure

📄 SKILL.md