Resolve Merge Conflicts

Apply only during an active merge, rebase, cherry-pick, or revert with conflicts. Never apply to ordinary edits or operations that have not started.

Contract

Before editing, inspect the operation state, git status, unmerged index entries, all conflict markers, and both primary sources. If the operation goal and primary sources do not determine intent, never guess; stop as Blocked. If required state or evidence cannot be read, the result is Unverifiable.

First, check only for an active operation marker and unmerged index entries. If neither exists, report Blocked: no active conflict once and stop without inspecting sources, markers, or checks.

Use Pass only after confirming every completion signal in the command evidence. Editing only the conflicted files is incomplete.