resolve-conflicts SKILL.md skillA
resolve-conflicts from haacked/dotfiles is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add haacked/dotfiles/resolve-conflicts@git:20260929.c582091Pins git:20260929.c582091 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- haacked/dotfiles
- Path
ai/skills/resolve-conflicts/SKILL.md- Versions recorded
- 5
- Latest version
- git:20260929.c582091, committed Sep 29, 2026
- First version recorded
- Jun 11, 2026
- Size
- 8,424 bytes
- Repository stars
- 135
- License
- none declared
Resolve git conflicts with AI-powered analysis, including mergiraf structural merging, lock file handling, and stacked PR duplicate detection.
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 Git Conflicts Resolve conflicts from any git operation (rebase, merge, cherry-pick, revert) with intelligent handling of lock files, migrations, mergiraf-supported languages, and stacked PR duplicates. ## Arguments (parsed from user input) - No arguments: detect context, resolve conflicts, continue the operation - `--abort`: abort the current operation - `--continue`: skip resolution, just run the appropriate continue command Example invocations: - `/resolve-conflicts` -- detect context, resolve conflicts, continue - `/resolve-conflicts --abort` -- abort current rebase/merge/cherry-pick/revert - `/resolve-conflicts --continue` -- continue without resolving (e.g., after manual edits) ## Your Task ### Step 1: Detect Context Run the status script: ```bash scripts/conflict-status.sh ``` This outputs tab-separated: `context\tprogress\tbranch` Parse the fields: - `context`: one of `rebase`, `merge`, `cherry-pick`, `revert`, `none` - `progress`: `current/total` for rebase (e.g., `3/12`), empty for other contexts - `branch`: the branch being worked on Check for unmerged files: ```bash git diff --name-only --diff-filter=U ``` …
Read the whole file at its exact version.
How to install
mdr add haacked/dotfiles/resolve-conflicts@sha256:526d9cddc3a0987dThe line at the top of this page pins the label git:20260929.c582091, 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_3nf4s2vmekhfa62u)
0 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 5 versions of this file, between Jun 11, 2026 and Sep 29, 2026, about one every 27 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20260929.c582091 latest | 2026-09-29 | c582091 | 8,424 B | A | view · diff |
| git:20260916.d09a928 | 2026-09-16 | d09a928 | 8,424 B | A | view · diff |
| git:20260821.de0b8f1 | 2026-08-21 | de0b8f1 | 6,942 B | A | view · diff |
| git:20260616.800f32f | 2026-06-16 | 800f32f | 6,979 B | A | view · diff |
| git:20260611.7b8f307 | 2026-06-11 | 7b8f307 | 6,980 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 (8424 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
haacked/dotfiles · 135 stars · license none declared · pushed 2026-11-01 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_3nf4s2vmekhfa62u GET https://markdownregistry.com/api/v1/resolve?ref=haacked/dotfiles/resolve-conflicts GET https://markdownregistry.com/api/v1/blob/526d9cddc3a0987d71eca1a99a5edcdfc620e09102e195e4b175a231c32ea594
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 haacked/dotfiles
Every file in haacked/dotfiles