resolve-merge-conflicts SKILL.md skillA
resolve-merge-conflicts from stealth-factory/skills is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add stealth-factory/skills/resolve-merge-conflicts@v1.1.0Pins v1.1.0 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- stealth-factory/skills
- Path
skills/resolve-merge-conflicts/SKILL.md- Versions recorded
- 3
- Latest version
- v1.1.0, committed Aug 15, 2026
- First version recorded
- Jun 27, 2026
- Size
- 8,192 bytes
- Repository stars
- 5
- License
- MIT
Resolve git merge/rebase conflicts non-destructively — preserving the intent of BOTH sides — and hand off to a human when a conflict can't be resolved safely. Use when a branch or PR has conflicts with its base ('this branch has conflicts that must be resolved', GitHub mergeable=CONFLICTING / mergeStateStatus=DIRTY), when a rebase / merge / cherry-pick / stash / revert stops with conflict markers (<<<<<<< ======= >>>>>>>), when a PR is behind base and needs updating, when syncing a long-lived…
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
# Resolve merge conflicts (non-destructively) Resolve git conflicts so that **both sides' intent survives**, verify the result, and **stop and ask a human** the moment a safe resolution isn't obvious. The git mechanics are the easy part; the danger is *silently dropping someone's work* — a blind "take theirs," a clean-looking textual merge that's logically broken, or a force-push over a teammate's commits. Command recipes live in [`reference/playbook.md`](./reference/playbook.md) (load on demand). This body is the decision rules. ## First: rebase or merge? You update a feature/PR branch against its base one of two ways. Either is fine — pick by context, not dogma: | | `git rebase origin/main` | `git merge origin/main` | | --- | --- | --- | | History | linear (replays your commits) | adds a merge commit | | Conflicts | may re-hit the **same** conflict per replayed commit (turn on `rerere`) | resolve **once** | | Push after | `--force-with-lease` (rewrites your branch) | normal push | | Best for | your **own** unshared PR branch | a branch **others** also commit to | In a **squash-merge** repo (see …
Read the whole file at its exact version.
How to install
mdr add stealth-factory/skills/resolve-merge-conflicts@sha256:82172fa5a995c52bThe line at the top of this page pins the label v1.1.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.
[](https://markdownregistry.com/a/art_3f75unmhjfektlvk)
2 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 3 versions of this file, between Jun 27, 2026 and Aug 15, 2026, about one every 25 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| v1.1.0 latest | 2026-08-15 | 9b11598 | 8,192 B | A | view · diff |
| v1.1.0 | 2026-07-02 | fb71220 | 8,191 B | A | view · diff |
| v1.0.0 | 2026-06-27 | adf7254 | 7,985 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 (8192 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
stealth-factory/skills · 5 stars · license MIT · pushed 2026-10-09 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_3f75unmhjfektlvk GET https://markdownregistry.com/api/v1/resolve?ref=stealth-factory/skills/resolve-merge-conflicts GET https://markdownregistry.com/api/v1/blob/82172fa5a995c52b665cebd0a20e5bf8a0bc0069af53db93e09d0cf384eeb4ee
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 stealth-factory/skills
Every file in stealth-factory/skills