resolve-conflicts SKILL.md skillA

resolve-conflicts from tailcallhq/forgecode is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.

Install it, pinned
mdr add tailcallhq/forgecode/resolve-conflicts@git:20251127.ee24908

Pins git:20251127.ee24908 in mdr.lock. Pin the fingerprint instead.

Audit grade
A, 17 of 17 checks passed
Kind
SKILL.md skill
Repository
tailcallhq/forgecode
Path
.forge/skills/resolve-conflicts/SKILL.md
Versions recorded
4
Latest version
git:20251127.ee24908, committed Nov 27, 2025
First version recorded
Nov 25, 2025
Size
17,965 bytes
Repository stars
7,634
License
Apache-2.0

Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.

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

# Git Conflict Resolution

Resolve Git merge conflicts by intelligently combining changes from both branches while preserving the intent of both changes. This skill follows a plan-first approach: assess conflicts, create a detailed resolution plan, get approval, then execute.

## Core Principles

1. **Plan Before Executing**: Always create a structured resolution plan and get user approval before making changes
2. **Prefer Both Changes**: Default to keeping both changes unless they directly contradict
3. **Merge, Don't Choose**: Especially for imports, tests, and configuration
4. **Regenerate Generated Files**: Never manually merge generated files - always regenerate them from their sources
5. **Backup Before Resolving**: For deleted-modified files, create backups first
6. **Validate with Tests**: Always run tests after resolution
7. **Explain All Resolutions**: For each conflict resolved, provide a one-line explanation of the resolution strategy
8. **Ask When Unclear**: When the correct resolution isn't clear from the diff, present options to the user and ask for their choice

## Workflow

### Step 1: Assess the Conflict Situation
…

Read the whole file at its exact version.

How to install

No tool to install first
claude plugin marketplace add https://markdownregistry.com/mp/a/art_wzxdntpy7rhvquom/f961abddb0ea9757fb43781605d24697f7decf18dfa56cdd414400589f9dd633.json

Then /plugin install resolve-conflicts@markdownregistry-wzxdntpy7rhvquom in Claude Code. It installs git:20251127.ee24908, the one graded A here, pinned to the commit it was graded at, and leaves it there.

The exact contents, by fingerprint
mdr add tailcallhq/forgecode/resolve-conflicts@sha256:f961abddb0ea9757

The line at the top of this page pins the label git:20251127.ee24908, 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 badge

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

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

Ask from your agent
claude mcp add --transport http markdownregistry https://markdownregistry.com/mcp/registry

Then ask it: what changed in tailcallhq/forgecode/resolve-conflicts since the version I have? It reads every saved version here, no key and no account. Any agent that speaks MCP can add it.

Got a copy of resolve-conflicts from somewhere else? Ask it: where did my resolve-conflicts come from, and what was changed? It names the public original, the version yours is closest to and every changed line. The text is not kept.

Versions

The registry has recorded 4 versions of this file, between Nov 25, 2025 and Nov 27, 2025, more than one a day.

Watch this file (sign in, one email per new version)

versioncommittedcommitsizeaudit
git:20251127.ee24908 latest2025-11-27 ee24908 17,965 BA view · diff
git:20251125.e8dfb5f2025-11-25 e8dfb5f 15,179 BA view · diff
git:20251125.ede5a822025-11-25 ede5a82 13,846 BA view · diff
git:20251125.74b4be02025-11-25 74b4be0 8,485 BA view
Keep it current by itself, install once

Committed this skill to a repository? Install the markdownregistry skill updates app on it, or on all of them. When the registry saves a newer version, a pull request brings your copy to it within minutes, the newest version first, then what changed and any check it newly trips. A copy you edited is never touched, and nothing is deleted.

Install on GitHub

It asks to read and write contents and pull requests, and to read metadata. No workflow file, no Actions setting, nothing runs on your runners. Uninstall it and everything the registry kept about your repository is deleted.

Keep it current by itself

Committed this skill to a repository? Add one workflow file, and when a newer version is saved, a pull request brings your copy to it, the newest version first, then what changed and any check it newly trips. A copy you edited is never touched, and nothing is deleted.

mkdir -p .github/workflows && curl -fsSL https://markdownregistry.com/ci/skill-updates.yml -o .github/workflows/skill-updates.yml

It runs daily on GitHub Actions, no key and no account. Read the workflow before you add it.

Check a whole project

From the root of your project, one line hashes each installed skill's SKILL.md, your AGENTS.md and your CLAUDE.md, and asks the registry once. Only the fingerprints and paths are sent.

sha256sum .claude/skills/*/SKILL.md AGENTS.md CLAUDE.md | curl -s --data-binary @- https://markdownregistry.com/api/v1/check-copies

In CI, add --fail-with-body: the answer is 409 when any file is behind, so the step fails and still prints which files.

sha256sum .claude/skills/*/SKILL.md AGENTS.md CLAUDE.md | curl -s --fail-with-body --data-binary @- https://markdownregistry.com/api/v1/check-copies

No sha256sum on your machine? shasum -a 256 prints the same lines.

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 (17965 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

tailcallhq/forgecode · 7,634 stars · license Apache-2.0 · pushed 2026-11-13 · branch main

API

GET https://markdownregistry.com/api/v1/artifacts/art_wzxdntpy7rhvquom
GET https://markdownregistry.com/api/v1/resolve?ref=tailcallhq/forgecode/resolve-conflicts
GET https://markdownregistry.com/api/v1/blob/f961abddb0ea9757fb43781605d24697f7decf18dfa56cdd414400589f9dd633

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.

More from tailcallhq/forgecode

create-agent SKILL.md skill
tailcallhq/forgecode · .forge/skills/create-agent/SKILL.md · Create new agents for the code-forge application. Agents are stored as .md files in the <cwd>/.forge/agents directory…
git:20260126.0427bf8 · audit A · 7,634 stars
create-command SKILL.md skill
tailcallhq/forgecode · .forge/skills/create-command/SKILL.md · Create new commands for the code-forge application. Commands are stored as .md files in the <cwd>/.forge/commands…
git:20260126.0427bf8 · audit A · 7,634 stars
create-github-issue SKILL.md skill
tailcallhq/forgecode · .forge/skills/create-github-issue/SKILL.md · Create GitHub issues using GitHub CLI with support for templates, labels, assignees, milestones, and draft issues. Use…
git:20260212.ac26e78 · audit A · 7,634 stars
create-plan SKILL.md skill
tailcallhq/forgecode · .forge/skills/create-plan/SKILL.md · Generate detailed implementation plans for complex tasks. Creates comprehensive strategic plans in Markdown format with…
git:20251211.d9b44e8 · audit A · 7,634 stars
debug-cli SKILL.md skill
tailcallhq/forgecode · .forge/skills/debug-cli/SKILL.md · Use when users need to debug, modify, or extend the code-forge application's CLI commands, argument parsing, or CLI…
git:20251129.d8cba1f · audit A · 7,634 stars
github-pr-comments SKILL.md skill
tailcallhq/forgecode · .forge/skills/github-pr-comments/SKILL.md · Resolve inline code review comments on a GitHub PR. Use when asked to "resolve review comments", "address PR feedback"…
git:20260402.238a5b9 · audit A · 7,634 stars
post-forge-feature SKILL.md skill
tailcallhq/forgecode · .forge/skills/post-forge-feature/SKILL.md · Generate a Twitter/X post highlighting a Forge feature. Use when the user asks to write a tweet, create a Twitter post…
git:20260321.bba73fb · audit A · 7,634 stars
resolve-fixme SKILL.md skill
tailcallhq/forgecode · .forge/skills/resolve-fixme/SKILL.md · Find all FIXME comments across the codebase and fully implement the work they describe. Use when the user asks to fix…
git:20260413.7ca79c7 · audit A · 7,634 stars
test-reasoning SKILL.md skill
tailcallhq/forgecode · .forge/skills/test-reasoning/SKILL.md · Validate that reasoning parameters are correctly serialized and sent to provider APIs. Use when the user asks to test…
git:20260402.1e409fa · audit A · 7,634 stars
write-release-notes SKILL.md skill
tailcallhq/forgecode · .forge/skills/write-release-notes/SKILL.md · Generate engaging, high-energy release notes for a given version tag. Fetches the release from GitHub, retrieves every…
git:20260413.a1642f4 · audit A · 7,634 stars
AGENTS.md AGENTS.md file
tailcallhq/forgecode · AGENTS.md
git:20251208.4905ae0 · audit A · 7,634 stars
minimal-skill SKILL.md skill
tailcallhq/forgecode · crates/forge_repo/src/fixtures/skills_with_resources/minimal-skill/SKILL.md · A minimal skill with no resources
git:20251124.2b8f212 · audit B · 7,634 stars

Every file in tailcallhq/forgecode

Other files named resolve-conflicts

resolve-conflicts SKILL.md skill
haacked/dotfiles · ai/skills/resolve-conflicts/SKILL.md · Resolve git conflicts with AI-powered analysis, including mergiraf structural merging, lock file handling, and stacked…
git:20260929.c582091 · audit A · 133 stars
resolve-conflicts SKILL.md skill
max-sixty/tend · plugins/tend-ci-runner/skills/resolve-conflicts/SKILL.md · Resolves merge conflicts on configured-bot PRs and, when requested, upstream dependency-bot PRs.
git:20260924.b3c4ba6 · audit A · 45 stars
resolve-conflicts SKILL.md skill
domengabrovsek/agent-config · skills/resolve-conflicts/SKILL.md · Resolves an in-progress git merge or rebase conflict by recovering each side's intent from commits, PRs, and issues…
git:20260829.3551d02 · audit A · 23 stars

Browse by kind, by grade A, or by owner.