resolving-merge-conflicts - Setup Guide¶

Source: mattpocock/skills (457,159 installs) Skill: mattpocock/skills@resolving-merge-conflicts Installs: 457,159 Category: Software Engineering / Git Workflow First Seen: Sep 9, 2026

resolving-merge-conflicts gives Hermes agents a strict 5-step protocol for resolving in-progress git merge/rebase conflicts. Its core rule: understand intent before touching hunks, preserve both intents where possible, and always resolve - never --abort. For an autonomous agent this is the difference between a merge that preserves everyone's intent and one that silently drops a co-author's work.

Installation¶

npx skills add mattpocock/skills --skill resolving-merge-conflicts

Prerequisites¶

Requirement	Details
Hermes Agent	Any recent version with skill support
Node.js 18+	For the `npx skills` CLI
Git repo with an active conflict	The skill activates on any in-progress merge/rebase

What It Provides¶

Step	Action	Why
1. See the current state	Check git history and the conflicting files	Baseline before any edit
2. Find primary sources	Read commit messages, PRs, issues/tickets behind each side	Understand why each change was made and its original intent
3. Resolve each hunk	Preserve both intents where possible; where incompatible, pick the one matching the merge's stated goal and note the trade-off; never invent new behaviour	Intent-preserving merges
4. Run automated checks	Typecheck, then tests, then format - fix anything the merge broke	No regressions smuggled in
5. Finish	Stage everything, commit; if rebasing, continue until all conflicts clear	Complete the operation

Hard rules: Always resolve; never --abort. Do not invent new behaviour.

Quick Start¶

Install: npx skills add mattpocock/skills --skill resolving-merge-conflicts
Trigger: any in-progress git merge or git rebase with conflicts - the skill activates automatically via its description ("Use when you need to resolve an in-progress git merge/rebase conflict")
The agent follows the 5-step protocol and commits the finished merge/rebase

Integration with CorpusIQ¶

CorpusIQ is the connector layer that lets AI assistants read the systems a business already runs on - accounting, payments, CRM, email, files and analytics - and answer with the source named. It is read-only by design: it retrieves data and never writes to, or acts in, a connected system, which is what makes it safe to point at live accounts.

This page is part of the CorpusIQ directory, the reference we maintain for the MCP server and agent-skill ecosystem. Run alongside CorpusIQ, a third-party server like this one can be combined with a company's own business data in a single answer.

See what CorpusIQ connects

Limitations / Verification¶

# Verify skill installed
hermes skills list | grep resolving-merge-conflicts

# Functional test
git merge feature-branch   # create a conflict, then invoke the skill

Short protocol skill (no scripts) - pairs naturally with git-guardrails-claude-code and setup-pre-commit from the same publisher for a complete git hygiene stack

Security¶

skills.sh listing - Pass
GitHub repo - Pass
Publisher - Pass