القائمة
Resolve git merge conflicts. Use when git status shows unmerged paths or files contain conflict markers (<<<<<<< / ======= / >>>>>>>).
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
Add terms, context, or instructions to Shama voice-to-text files for clipboard mode (Ctrl+Opt+Space) or shell-command mode (Ctrl+Opt+S), at project or global level.
Initialize Shama voice-to-text config for the project — create voice.json, voice-vocabulary.md, voice-context.md, and register the project in Shama's registry.toml.
Reflect on codebase navigation effectiveness at end of conversation. Surfaces dead ends, inefficiencies, missing context. Does not write files — pair with /kiro:steering-custom to persist.
Use when picking or vetting a keyboard shortcut on macOS. Triggers include "what hotkey should I use for X", "is `<combo>` available", "does this shortcut conflict", "recommend a keybinding for…", "check `<combo>` against my setup", "pick a hotkey for…", or any mention of choosing/binding/changing a shortcut in WezTerm, tmux, Zed, Chrome, Claude Code, or macOS. Determines whether a proposed combo collides with OS-reserved bindings, app defaults, or the user's customizations, and recommends ergonomic alternatives when needed.
Detect and remove dead code with knip. Use when the user asks to "run knip", "find unused files", "find unused exports", "find unused dependencies", "clean up dead code", "remove dead code", "set up knip", "configure knip", "knip.json", "knip false positive", "knip CI", or mentions a `knip` config, dependency bloat, bundle bloat from unused imports, or tree-shaking unused exports. Covers the configuration-first workflow, confidence-gated deletion, framework-specific gotchas (Next.js 15+, Tailwind, Storybook, Jest, Bun's test runner and `bun build --compile`), monorepos, CI integration, and performance tuning.
This skill should be used when the user asks to "set up react-scan", "install react-scan", "diagnose React re-renders", "find unnecessary renders", "find unstable props", "automate React render checks with Playwright", "react-scan + playwright", "measure component renders programmatically", "check why a React component is slow", or mentions React rendering issues, slow React interactions, render counts, or component-level perf attribution. Covers install across Next.js/Vite/Remix/script-tag/browser-extension, the lite headless API for CI, and the canonical render-attribution → fix → validate loop driven through Playwright.
| name | fix-merge-conflicts |
| description | Resolve git merge conflicts. Use when git status shows unmerged paths or files contain conflict markers (<<<<<<< / ======= / >>>>>>>). |
| allowed-tools | Bash, Read, Edit, Glob, Grep |
Resolve git merge conflicts systematically by understanding the intent behind conflicting changes before proposing resolutions.
!git status
Follow all five phases in order. Complete analysis and receive user approval before implementing any changes.
Examine what changed in each branch:
MERGE_HEAD (merge), REBASE_HEAD (rebase), or CHERRY_PICK_HEAD (cherry-pick) to identify the operation in progressgit log --oneline --graph HEAD <source_HEAD> to see commit history on both sidesgit diff --name-only --diff-filter=U to list all files with conflictsgit show on commits that modified the conflicting filesgit diff HEAD...<source_HEAD> -- <file> to see branch-level differencesFrom the analysis, identify:
Determine the resolution strategy:
Present the resolution plan to the user before making any changes. Include:
Implement changes ONLY after the user explicitly approves the resolution plan.
After approval:
git diff to verify the resolution looks correctgit add