Resolve Merge Conflicts

1. Establish the operation

Inspect git status, unmerged paths, the current merge/rebase/cherry-pick metadata, and the commits on both sides. Do not abort, continue, stage, or commit yet. Stop if the repository state does not match the user's request.

Completion criterion: every conflicted path and the active Git operation are identified.

2. Recover both intents

For each conflict, inspect the base, ours, theirs, surrounding code, relevant commits, tests, specifications, and issue or PR context when available. Classify the resolution: