resolve-conflicts skillA
resolve-conflicts is agent-read markdown (skill) from tailcallhq/forgecode: 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..
Indexed from public GitHub and served as immutable, content-addressed versions. Install it pinned to an exact SHA-256 with the mdr CLI, and every file is verified before it reaches your agent: the main file against the SHA-256 recorded here, the others against the git hashes of its source commit. The deterministic audit below grades 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
mdr add tailcallhq/forgecode/resolve-conflicts@git:20251127.ee24908mdr add tailcallhq/forgecode/resolve-conflicts@sha256:f961abddb0ea9757Pin to a label to follow the author's releases, or to a sha256 for exact bytes. Either way the resolved hash is written to mdr.lock, and mdr install fetches those bytes again and checks them, so it installs them exactly or fails.
[](https://markdownregistry.com/a/art_wzxdntpy7rhvquom)
2 badge views in 30 days
Versions
| 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 |
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,637 stars · license Apache-2.0 · pushed 2026-09-26 · 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 agent 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.
More from tailcallhq/forgecode
Every file in tailcallhq/forgecode