resolve-migration-conflict SKILL.md skillB
resolve-migration-conflict from joebew42/aido is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add joebew42/aido/resolve-migration-conflict@git:20261108.7e14cbbPins git:20261108.7e14cbb in mdr.lock. Pin the fingerprint instead.
- Audit grade
- B, 16 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- joebew42/aido
- Path
plugins/aido/skills/resolve-migration-conflict/SKILL.md- Versions recorded
- 5
- Latest version
- git:20261108.7e14cbb, committed Nov 8, 2026
- First version recorded
- Nov 5, 2026
- Size
- 6,714 bytes
- Repository stars
- 5
- License
- MIT
Resolves database migration conflicts after rebasing with main/master, for any migration tool. Invoked when the user has a schema or migration conflict after rebase, two migrations claiming the same position, or runs /aido:resolve-migration-conflict.
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 Migration Conflict
Resolve database migration conflicts after a rebase onto the main/master branch. The steps work with
any migration tool. The commands come from the host repository.
Load `${CLAUDE_PLUGIN_ROOT}/guidelines/language.md` and follow it in everything you write for a person.
## When to Use This Skill
Use this skill when:
- your PR has been open for a while
- another PR with a migration was merged to main/master
- after a rebase, a generated schema snapshot conflicts, or your migration is no longer the latest
- the migration tool reports two migrations at the same position, or more than one "head"
## Step 0: Learn the Project's Migration Tooling
Load `${CLAUDE_PLUGIN_ROOT}/guidelines/git-workflow.md`. Gather the host repository's conventions as
`${CLAUDE_PLUGIN_ROOT}/guidelines/project-conventions.md` describes. From its agent instruction files,
docs, scripts and existing migrations, find out:
- **the commands** to apply migrations, roll back the latest one, and prepare the test database
- **where migrations live**, and how they are named
- **how order is decided**, one of two ways:
…Read the whole file at its exact version.
How to install
mdr add joebew42/aido/resolve-migration-conflict@sha256:a6814d19a2a55d5dThe line at the top of this page pins the label git:20261108.7e14cbb, 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_qjdybv2pkydoxwml)
0 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 5 versions of this file, between Nov 5, 2026 and Nov 8, 2026, more than one a day.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20261108.7e14cbb latest | 2026-11-08 | 7e14cbb | 6,714 B | B | view · diff |
| git:20261107.13c9f8c | 2026-11-07 | 13c9f8c | 6,773 B | B | view · diff |
| git:20261106.1a5f142 | 2026-11-06 | 1a5f142 | 6,775 B | B | view · diff |
| git:20261105.e3e5a3e | 2026-11-05 | e3e5a3e | 6,652 B | B | view · diff |
| git:20261105.fd7a4d4 | 2026-11-05 | fd7a4d4 | 6,547 B | B | view |
Audit of the latest version
- fail: Frontmatter declares a name
- pass: Frontmatter block present
- pass: Frontmatter declares a description
- pass: Size between 200 bytes and 200 KB (6714 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
Starting a new one? Use a template for SKILL.md on mdpantry, which passes every one of these checks and says what to change in it.
Source
joebew42/aido · 5 stars · license MIT · pushed 2026-11-08 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_qjdybv2pkydoxwml GET https://markdownregistry.com/api/v1/resolve?ref=joebew42/aido/resolve-migration-conflict GET https://markdownregistry.com/api/v1/blob/a6814d19a2a55d5d53be4f677598d790bc80e63b2aa3f76136d095d9925c5814
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.