跳到正文
cccskills
免费在 GitHub 公开

drizzle-migration-conflict-resolution

Resolve Drizzle migration merge/rebase conflicts in OneQuery by rewinding local-only migration history and regenerating migration metadata. Use when conflicts involve packages/db/src/migrations/meta/_journal.json, migration SQL files in packages/db/src/migrations/*.sql, or migration snapshots in packages/db/src/migrations/meta/*_snapshot.json.

中文简介正在准备中。当前显示原文说明。

查看安装方法

包含的文件(2)

  • SKILL.md2.5 KB
  • agents/openai.yaml251 B

SKILL.md(原文)

安装前可以查看交给 AI 代理的指令内容。

DB Migration Conflict Resolution

Goal

Resolve Drizzle migration conflicts without manually editing migration SQL or meta/_journal.json.

Workflow

  1. Inspect conflict scope.
  • Run git status --short.
  • Confirm the migration conflict includes packages/db/src/migrations/meta/_journal.json.
  • If non-migration conflicts need product decisions, stop and ask the user.
  1. Fetch the base branch.
  • Run git fetch origin.
  • Default to origin/main unless the user requests another base branch.
  1. Keep incoming journal history as baseline.
  • Run git checkout --theirs packages/db/src/migrations/meta/_journal.json.
  • Do not hand-edit packages/db/src/migrations/meta/_journal.json.
  1. Find local-only migration artifacts.
  • Run:
comm -23 <(git ls-tree -r --name-only HEAD packages/db/src/migrations | sort) \
  <(git ls-tree -r --name-only origin/main packages/db/src/migrations | sort)
  • Treat returned SQL and snapshot files as local-only migration history.
  1. Remove local-only migration artifacts.
  • Run git rm <each-local-only-file> for returned migration SQL and snapshot files.
  • Keep incoming branch migration files intact.
  1. Regenerate migration chain from schema.
  • Run cd packages/db && bun run db:generate.
  • Let Drizzle regenerate the next migration and update meta/_journal.json.
  1. Stage and verify.
  • Run git add packages/db/src/migrations packages/db/src/migrations/meta/_journal.json.
  • Confirm no conflict markers remain:
rg -n "^(<<<<<<<|=======|>>>>>>>)" packages/db/src/migrations/meta/_journal.json
  • Inspect generated SQL and verify it reflects expected schema deltas only.
  1. Finalize merge/rebase.
  • Continue merge/rebase flow with git commit or git rebase --continue.
  • If pre-commit/pre-push hooks rewrite migration metadata formatting, commit the formatted files so the branch is clean.

Guardrails

  • Never manually create or edit files inside packages/db/src/migrations/.
  • Never manually edit packages/db/src/migrations/meta/_journal.json.
  • Regenerate via bun run db:generate after history rewind.
  • If generated migration includes unexpected schema changes, stop and ask the user before committing.

评价

还没有评价。欢迎分享你的使用感受。

评论

无需登录即可发表。欢迎分享使用感受、提问,或说明在哪些环境下无法运行。

还没有评论。来写第一条吧。

提交后会立即公开。请勿填写邮箱、电话等个人信息。URL 最多 2 个。

0 / 1000 字

此表单受 reCAPTCHA 保护,适用 Google 的隐私权政策和服务条款。

同一仓库的技能

Automates browser interactions for web testing, form filling, screenshots, and data extraction. Use when the user needs to navigate websites, interact with web pages, fill forms, take screenshots, test web applications, or extract information from web pages.

中文简介正在准备中。当前显示原文说明。

wordbricks/onequery172026年7月30日 更新

A scoring scale for evaluating how well a CLI is designed for AI agents, based on the "Rewrite Your CLI for AI Agents" principles.

中文简介正在准备中。当前显示原文说明。

wordbricks/onequery172026年7月30日 更新

Score a repository's agentic legibility from repo-visible evidence only. Use when Codex needs to audit how easy a codebase is for coding agents to discover, bootstrap, validate, and navigate, especially for harness-engineering reviews, developer-experience audits, repo cleanup, or before/after comparisons after improving docs, tooling, or architectural constraints.

中文简介正在准备中。当前显示原文说明。

wordbricks/onequery172026年7月30日 更新

astro

免费

Expert in Astro framework with static generation and partial hydration patterns

中文简介正在准备中。当前显示原文说明。

wordbricks/onequery172026年7月30日 更新

Babysit a GitHub pull request after creation by continuously polling review comments, CI checks/workflow runs, and mergeability state until the PR is merged/closed or user help is required. Diagnose failures, retry likely flaky failures up to 3 times, auto-fix/push branch-related issues when appropriate, and keep watching open PRs so fresh review feedback is surfaced promptly. Use when the user asks Codex to monitor a PR, watch CI, handle review comments, or keep an eye on failures and feedback on an open PR.

中文简介正在准备中。当前显示原文说明。

wordbricks/onequery172026年7月30日 更新

Adopt better-result in an existing TypeScript codebase. Use when replacing try/catch, Promise rejection handling, null sentinels, or thrown domain exceptions with typed Result workflows.

中文简介正在准备中。当前显示原文说明。

wordbricks/onequery172026年7月30日 更新

查看 wordbricks 的全部技能

报告此技能的问题