メニュー
Resolve an in-progress merge or rebase conflict from proven product intent. Use only when Git reports an actual conflict.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
| name | resolving-merge-conflicts |
| description | Resolve an in-progress merge or rebase conflict from proven product intent. Use only when Git reports an actual conflict. |
| metadata | {"dverity_class":"reusable-dependency","reads":[]} |
Use this dependency only when Git reports an in-progress merge or rebase conflict. Confirm the operation, list unmerged paths, and recover both sides' product intent from current scope truth before editing.
Resolve the smallest conflict whose intent is proven, stage only that path, then continue the existing Git operation and rerun focused checks. If intent is ambiguous, abort or stop safely and report the blocker; never invent behavior to make the operation finish.
Do not start a merge or rebase merely to invoke this Skill. Do not use it for a clean target refresh, ordinary diff overlap, or speculative cleanup.
Review and land one authenticated provider-native review item. Use when current-head review, landing, closeout, and remote-main parity are in scope.
Submit a named verified source for remote review. Use when explicit authority covers push and one review item, but not approval or landing.
Simplify verified changes before remote submission. Use for deletion-first, YAGNI, native-library, structural, and test-seam review.
Create narrow auditable local commits. Use when verified Dverity work must be staged and committed without absorbing unrelated changes.
Find and reuse the nearest correct mechanism before adding another. Use when a Dverity change would add reusable code, policy, or workflow meaning.
Diagnose and repair confirmed defects to Verified Local. Use for evidence-first bug repair; remote submission requires separate explicit authority.
