merjax_propose_pr_conflict_resolution
Ask AI (Opus 5.5) to PROPOSE a resolution for each conflict block of a PR's text files — the Conflicts tab's 'Propose resolutions' button. Nothing is committed: each proposal (the block's lines, an explanation, a confidence 0..1) is stored for the (base, head) pair and shown on the Conflicts tab and in merjax_list_pr_conflicts (unresolved[].proposal); accept a block with merjax_resolve_pr_conflict choices: {<hunk id>: 'ai'}, edit it with a custom choice, or pick another option, then merjax_commit_pr_conflict_resolution. Refused when the repository's merge-conflict mode is Manual only, when the PR author opted out of AI for conflicts, or when AI is unavailable (paused, not configured, over budget) — the error says which. A file over 60 KiB is reported too-large; repository text is sent as fenced data with secrets redacted. A file already proposed at this pair is not sent again unless again: true. Requires write access and 'repo' scope.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| repo | Yes | Repo name | |
| again | No | Ask again for files that already have a proposal at this pair (default false) | |
| owner | Yes | Repo owner — username or organisation slug | |
| paths | No | Optional: only these conflicted files (default: every text file without a saved resolution) | |
| number | Yes | PR number | |
| base_sha | No | Optional: baseSha from merjax_list_pr_conflicts; a moved base is refused | |
| head_sha | No | Optional: headSha from merjax_list_pr_conflicts; a moved head is refused |