Merge conflicts

Resolve by intent and preserve unrelated work.

Process

1. Identify the merge, rebase, or cherry-pick and its current commit. Record conflicting paths and pre-existing staged and unstaged changes.
2. Read each side's commits and relevant PRs or tickets. Explain why each change exists.
3. Preserve both intents where possible. Resolve incompatible behavior using the caller's stated goal; escalate a decision the evidence cannot settle.
4. Run applicable project checks through its wrappers and resource limits. Fix what the resolution broke.
5. Stage resolved paths explicitly. Inspect the entire staged diff against the initial state. Do not incorporate unrelated staged work into a commit.
6. Continue the actual operation within the caller's authorization. Use the correct merge, rebase, or cherry-pick continuation and report remaining conflicts.

Do not