Home / rjmurillo / ai-agents · GitHub

merge-resolver SKILL.md skillA

merge-resolver from rjmurillo/ai-agents is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.

Install it, pinned

mdr add rjmurillo/ai-agents/merge-resolver@v2.3.0

Pins v2.3.0 in mdr.lock. Pin the fingerprint instead.

Audit grade: A, 17 of 17 checks passed
Kind: SKILL.md skill
Repository: rjmurillo/ai-agents
Path: .claude/skills/merge-resolver/SKILL.md
Versions recorded: 5
Latest version: v2.3.0, committed Oct 8, 2026
First version recorded: Sep 15, 2026
Size: 17,266 bytes
Repository stars: 48
License: MIT

Resolve merge conflicts by analyzing git history and commit intent. Handles PR conflicts, branch conflicts, and session file conflicts with automated resolution for known patterns. Use when you say "resolve merge conflicts", "fix conflicts on this branch", "PR has conflicts with main", "can't merge due to conflicts", or "resolve PR conflicts". Do NOT use for rebasing, cherry-picking, or complex history rewrites (use git-advanced-workflows).

Collected from public GitHub. Every version is saved exactly as it was and never changes. Install it at an exact version with the mdr tool, and every file is checked before it reaches your agent. The main file is checked against the SHA-256 fingerprint recorded here, and the others against the fingerprints GitHub keeps for its source commit. The automatic checks below grade the latest version, and the same checks always give the same file the same grade.

What the file says

# Merge Resolver

Resolve merge conflicts by analyzing git history and commit intent.

## Quick Start

```bash
# Resolve conflicts for a specific PR
python3 .claude/skills/merge-resolver/scripts/resolve_pr_conflicts.py \
    --pr-number 123 --branch-name "fix/my-feature" --target-branch "main"

# Dry-run mode (no side effects)
python3 .claude/skills/merge-resolver/scripts/resolve_pr_conflicts.py \
    --pr-number 123 --branch-name "fix/test" --dry-run
```

## Triggers

| Trigger Phrase | Operation |
|----------------|-----------|
| `resolve merge conflicts` | Auto-detect branch/PR and resolve |
| `fix conflicts on this branch` | Context-aware conflict resolution |
| `PR has conflicts with main` | Merge-based conflict resolution |
| `can't merge due to conflicts` | Analyze and fix blocking conflicts |
| `resolve PR conflicts` | Resolve conflicts for a specific PR number |

## Process

### Phase 0: Execution Capability Precondition (BLOCKING)
…

Read the whole file at its exact version.

How to install

The exact contents, by fingerprint

mdr add rjmurillo/ai-agents/merge-resolver@sha256:efb9dd88f88e1db7

The line at the top of this page pins the label v2.3.0, which is what most people want. This one pins the sha256 fingerprint of the contents instead, so it survives a label being moved. Either way the exact version is written to mdr.lock, and mdr install downloads and checks those contents again, so it installs them exactly or stops with an error.

Badge

[![mdr](https://markdownregistry.com/badge/art_ifmdrnbmqwathcre.svg)](https://markdownregistry.com/a/art_ifmdrnbmqwathcre)

0 badge image fetches in 30 days. What the badge shows.

Versions

The registry has recorded 5 versions of this file, between Sep 15, 2026 and Oct 8, 2026, about one every 6 days.

version	committed	commit	size	audit
v2.3.0 latest	2026-10-08	827cbfd	17,266 B	A	view · diff
v2.3.0	2026-09-25	3fda96c	17,336 B	A	view · diff
v2.3.0	2026-09-23	efd148e	17,043 B	A	view · diff
v2.3.0	2026-09-23	f45e807	16,872 B	A	view · diff
v2.3.0	2026-09-15	55fc554	16,819 B	A	view

Audit of the latest version

A 17 of 17 checks passed. Fixed automatic checks with no AI involved, so the same checks give the same answer every run.

pass: Frontmatter block present
pass: Frontmatter declares a name
pass: Frontmatter declares a description
pass: Size between 200 bytes and 200 KB (17266 bytes)
pass: No zero-width or bidi control characters
pass: No instruction hidden inside an HTML comment
pass: No link to an exfiltration or paste host
pass: No credential-shaped string
pass: No instruction to send local credentials anywhere
pass: No text hidden with inline styles
pass: No prompt-injection phrasing
pass: No curl or wget piped into a shell
pass: No recursive delete of root, home or parent
pass: No instruction to read or print local credentials
pass: No base64 blob over 200 characters
pass: No link to a raw IP address
pass: No script tag

Source

GitHub

rjmurillo/ai-agents · 48 stars · license MIT · pushed 2026-10-20 · branch main

API

GET https://markdownregistry.com/api/v1/artifacts/art_ifmdrnbmqwathcre
GET https://markdownregistry.com/api/v1/resolve?ref=rjmurillo/ai-agents/merge-resolver
GET https://markdownregistry.com/api/v1/blob/efb9dd88f88e1db790d1b7946c4d51429be29585a55845899e269906065a2061

Your AI assistant does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.

Guides: the SKILL.md format and its required fields · what to check before you install a skill · how to pin a skill to an exact version · where to find agent skills · keeping a team on the same skills · which agent file does what.