메뉴
Resolve all merge conflicts on the current branch non-interactively, validate the build, and commit. Use when the user says "fix merge conflicts", "resolve conflicts", or when git status shows conflicting files.
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
Scan recent changes for AI-generated code slop and remove it. Use when the user says "deslop", "remove slop", "clean up AI code", or asks to remove AI-generated artifacts from the codebase.
Orchestrates implementation of a multi-task plan by spawning plan-implementer subagents in parallel. Use when the user provides a plan file or plan text and asks to implement it, execute it, or says "implement plan", "run plan", "execute plan".
Resolve on-screen seedit DOM elements to React source files, line numbers, component names, and ownership stacks using the app's dev-only element-source helpers and playwright-cli. Use when an agent needs to inspect a page element, map a snapshot ref to source code, confirm which component rendered a node, or follow up after $profile-browsing finds a rerender hotspot and needs file-level attribution.
Profile app performance while browsing, collecting Web Vitals and React rerender data via react-scan. Orchestrates parallel profiler subagents via playwright-cli to capture navigation timing, long tasks, layout shifts, LCP, React commit counts, render bursts, and per-component render data. Use when profiling browsing performance, finding bottlenecks, diagnosing excessive rerenders, or auditing page performance.
When the user wants to create or update a README.md file for a project. Also use when the user says "write readme," "create readme," "document this project," "project documentation," or asks for help with README.md. Produces thorough, verified documentation covering local setup, architecture, and distribution.
Perform a refactor pass focused on simplicity after recent changes. Use when the user asks for a refactor/cleanup pass, simplification, dead-code removal, or says "refactor pass".
| name | fix-merge-conflicts |
| description | Resolve all merge conflicts on the current branch non-interactively, validate the build, and commit. Use when the user says "fix merge conflicts", "resolve conflicts", or when git status shows conflicting files. |
| disable-model-invocation | true |
Resolve all merge conflicts on the current branch non-interactively and leave the repo buildable.
git status --porcelain
Collect files with U statuses or containing <<<<<<< / ======= / >>>>>>> markers.
Open each conflicting file and remove conflict markers. Merge both sides logically when feasible.
When sides are mutually exclusive, pick the variant that:
File-type strategies:
| File type | Strategy |
|---|---|
package.json | Merge keys conservatively, then corepack yarn install to regenerate yarn.lock |
yarn.lock | Never manually edit — regenerate with corepack yarn install |
Config files (.json, .yaml) | Preserve union of safe settings; don't delete required fields |
| Markdown / text | Include both unique sections, deduplicate headings |
| Binary files | Prefer current branch (ours) |
| Generated / build artifacts | Prefer current branch (ours), or regenerate |
Run all three checks. Fix any failures before proceeding.
corepack yarn build && corepack yarn lint && corepack yarn type-check
If package.json was modified, run corepack yarn install first.
git grep -n -I -E '^(<{7} |={7}$|>{7} )' -- .
If any markers remain, go back and resolve them.
git add -A
git commit -m "chore: resolve merge conflicts"
npx oxfmt <file> if they're .ts/.tsx/.js.corepack yarn build && corepack yarn lint && corepack yarn type-checkchore: resolve merge conflicts