// Resolve all merge conflicts on the current branch non-interactively, validate the package, and commit. Use when the user says "fix merge conflicts", "resolve conflicts", or when git status shows conflicting files.
Formats GitHub commit messages following Conventional Commits style with a title and optional description. Use when proposing or implementing code changes, writing commit messages, or when the user asks for commit message suggestions.
Commit current work by reviewing diffs, splitting into logical commits, and writing standardized messages. Use when the user says "commit", "commit this", "commit current work", or asks to create a git commit.
Retrieve up-to-date documentation for software libraries, frameworks, and components via the Context7 API. Use when looking up documentation for a programming library, verifying APIs, or obtaining current library examples.
Systematic evidence-based debugging using runtime logs or focused reproductions. Use when the user reports a bug, unexpected behavior, or asks to debug an issue.
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.
Helps users discover and install agent skills when they ask questions like "how do I do X", "find a skill for X", "is there a skill that can...", or express interest in extending capabilities.
| name | fix-merge-conflicts |
| description | Resolve all merge conflicts on the current branch non-interactively, validate the package, 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 and leave the repo buildable.
Detect conflicts:
git status --porcelain
rg '<<<<<<<|=======|>>>>>>>' .
Resolve each file. Preserve both sides' intent when feasible.
File-type strategies:
| File type | Strategy |
|---|---|
package.json | Merge keys conservatively, then run corepack yarn install |
yarn.lock | Regenerate with corepack yarn install; do not hand-edit |
| Config files | Preserve the union of safe settings |
| Markdown | Include both unique sections, deduplicate headings |
| Generated artifacts | Prefer regeneration or deletion over manual conflict resolution |
Validate:
corepack yarn build
corepack yarn type-check
corepack yarn test
corepack yarn format:check
Verify no markers remain:
rg '<<<<<<<|=======|>>>>>>>' .
Finalize:
git add -A
git commit -m "chore(merge): resolve conflicts"