merge-conflict SKILL.md skillA
merge-conflict from khaledsaeed18/dotclaude is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add khaledsaeed18/dotclaude/merge-conflict@git:20260608.0cc2133Pins git:20260608.0cc2133 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- khaledsaeed18/dotclaude
- Path
skills/version-control/merge-conflict/SKILL.md- Versions recorded
- 2
- Latest version
- git:20260608.0cc2133, committed Jun 8, 2026
- First version recorded
- Jun 6, 2026
- Size
- 5,270 bytes
- Repository stars
- 5
- License
- MIT
Resolve Git merge, rebase, cherry-pick, revert, and stash conflicts safely by understanding both sides and the operation in progress before integrating, then verifying the result builds and passes tests. Use when a merge/rebase/cherry-pick stops with conflicts or "needs merge".
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 conflicts by integrating the *intent* of both sides, never by blindly picking one or deleting code you don't understand. Work from the actual conflict, the operation that produced it, and the history behind each side. ## Hard rules: never break these - **Understand before you resolve.** Read what each side was trying to do (the commits, the surrounding code) before editing a single marker. A "resolved" conflict that drops one side's intent is a silent bug, not a fix. - **Never reflexively accept `--ours` or `--theirs`.** Whole-file side-picking is almost always wrong and discards real work. Resolve hunk by hunk. - **Know which side is which.** It flips by operation. In a `merge`, *ours* = the branch you're on, *theirs* = the branch being merged. In a `rebase`, it's **reversed**: *ours* = the branch you're replaying onto (upstream), *theirs* = your commits being replayed. Confirm before using either. - **Verify after resolving.** The merge succeeding means the markers are gone, not that the code is correct. Build, lint, and run tests before you consider it done. …
Read the whole file at its exact version.
How to install
mdr add khaledsaeed18/dotclaude/merge-conflict@sha256:a3e2004063c3849eThe line at the top of this page pins the label git:20260608.0cc2133, 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_37h2ic5i6ved4c6s)
4 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 2 versions of this file, between Jun 6, 2026 and Jun 8, 2026, about one every 2 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20260608.0cc2133 latest | 2026-06-08 | 0cc2133 | 5,270 B | A | view · diff |
| git:20260606.7d504a8 | 2026-06-06 | 7d504a8 | 5,315 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 (5270 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
khaledsaeed18/dotclaude · 5 stars · license MIT · pushed 2026-11-05 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_37h2ic5i6ved4c6s GET https://markdownregistry.com/api/v1/resolve?ref=khaledsaeed18/dotclaude/merge-conflict GET https://markdownregistry.com/api/v1/blob/a3e2004063c3849e0f61746a77aff24eb11622d9fcc96680604cf6e4ebdcb22e
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 khaledsaeed18/dotclaude
Every file in khaledsaeed18/dotclaude