メニュー
Resolve an in-progress git merge or rebase conflict. Use when Codex sees conflict markers, unmerged paths, rebase/merge state, or the user asks to finish a conflicted merge/rebase while preserving both sides' intent and project checks.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
Read credentials and secrets from Proton Pass through pass-cli with scoped agent sessions and non-disclosing handoffs. Use when retrieving passwords, TOTP codes, pass:// references, attachments, or other vault fields; logging into a website or application; running commands with Proton Pass secrets; inspecting vault, item, share, agent, or access-token metadata; using Proton Pass SSH keys; or diagnosing pass-cli installation, authentication, session, and permission failures.
Read-only review of a PR, branch, diff, or worktree changes for correctness, requested behavior, regressions, scope creep, proof gaps, and merge readiness. Use when asked to review changed code or decide whether work is safe to merge. Route over-engineering-only reviews to whittle-review and repository-wide structural scans to improve-codebase-architecture.
Review for over-engineering without applying fixes: find what to delete, replace with stdlib/native, or shrink. Use when asked to review a diff or audit a repo for unnecessary complexity, bloat, deletion candidates, or YAGNI violations. Correctness, requested behavior, merge readiness, security, and performance are out of scope; route ordinary code review to code-review.
Write, rewrite, critique, and manage high-taste technical program and engineering documents. Use when asked for better docs, specs, RFCs, decision memos, launch or readiness docs, completion records, Google Docs-ready drafts, less LLM-y writing, senior TPM or staff-engineer polish, document pruning, audience fit, decision clarity, or durable knowledge management.
Build, refine, and synthesize ChatGPT Pro consultation prompts. Use when the user asks for a paste-ready Pro prompt, wants Pro to audit, review, or critique a repo or plan, needs a follow-up after a Pro response, wants Pro feedback checked against local evidence, or wants a manual Pro consultation loop without browser monitoring.
Disciplined diagnosis loop for hard bugs and performance regressions. Reproduce → minimise → hypothesise → instrument → fix → regression-test. Use when user says "diagnose this" / "debug this", reports a bug, says something is broken/throwing/failing, or describes a performance regression.
| name | resolving-merge-conflicts |
| description | Resolve an in-progress git merge or rebase conflict. Use when Codex sees conflict markers, unmerged paths, rebase/merge state, or the user asks to finish a conflicted merge/rebase while preserving both sides' intent and project checks. |
Resolve the conflict that exists now. Preserve intent, avoid invention, and finish only after the project can prove the result.
Read the current state. Run git status --short, identify whether this is a merge or rebase, list unmerged paths, and inspect each conflicting file before editing.
Find primary intent. For each side of each conflict, read the relevant commits, messages, nearby history, PR/issue references when available, and surrounding code. Prefer source evidence over guessing from marker text.
Resolve each hunk. Preserve both intents where they are compatible. Where they conflict, choose the behavior that matches the merge/rebase goal and state the trade-off. Do not invent unrelated behavior while resolving.
Protect user work. Never run git merge --abort, git rebase --abort, git reset --hard, git checkout --, or clean untracked files unless the user explicitly asks. Do not discard untracked or unstaged work to make the conflict easier.
Run project checks. Discover the repository's command map before choosing checks. In ABB, start with scripts/AGENTS.md; typical checks are cargo fmt, cargo clippy, cargo test from the workspace root, plus Biome for TypeScript when touched. Fix only failures caused by the conflict resolution.
Finish deliberately. Stage the resolved files. If rebasing, continue the rebase until complete. If merging, create the merge commit only when the user asked you to commit or the repo workflow clearly requires it.
Report the resolved files, the intent preserved from each side, checks run, and any residual risk or checks skipped.
