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.
mdr add tailcallhq/forgecode/resolve-conflicts@git:20251127.ee24908Pins 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
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.
mdr add tailcallhq/forgecode/resolve-conflicts@sha256:f961abddb0ea9757The 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.
[](https://markdownregistry.com/a/art_wzxdntpy7rhvquom)
2 badge image fetches in 30 days. What the badge shows.
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)
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20251127.ee24908 latest | 2025-11-27 | ee24908 | 17,965 B | A | view · diff |
| git:20251125.e8dfb5f | 2025-11-25 | e8dfb5f | 15,179 B | A | view · diff |
| git:20251125.ede5a82 | 2025-11-25 | ede5a82 | 13,846 B | A | view · diff |
| git:20251125.74b4be0 | 2025-11-25 | 74b4be0 | 8,485 B | A | view |
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.
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.
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.
Installed this file, say at .claude/skills/resolve-conflicts/SKILL.md? Drop it here to learn which saved version you have and what changed since. Your browser works out its SHA-256 fingerprint and sends only that; the file itself never leaves your computer.
Or paste its contents
Your agent can run this same check on the agent markdown files you have installed, up to 50 in one ask. Add the registry once:
claude mcp add --transport http markdownregistry https://markdownregistry.com/mcp/registry
Then ask it to check the files you have installed. No key and no account.
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
- 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
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
Every file in tailcallhq/forgecode