gluecron_resolve_pr_conflict
Save a resolution for ONE conflicted file of a PR, as a draft for the exact (base_sha, head_sha) pair gluecron_list_pr_conflicts returned (a moved branch is refused: reload). Pass exactly one of: content (the whole resolved file — no conflict markers, at most 512 KiB), choices (hunk id → 'mine' | 'main' | 'both-mine-first' | 'both-main-first' | 'base' | {kind:'custom', lines:[…]}; applied server-side, a stale hunk id is refused), or keep ('mine' = the PR branch's version, 'main' = the base branch's; the only options for binary files and files one side deleted). Nothing is committed until gluecron_commit_pr_conflict_resolution. Requires write access and 'repo' scope.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| keep | No | 'mine' | 'main' — take one side whole | |
| path | Yes | The conflicted file's repo-relative path | |
| repo | Yes | Repo name | |
| owner | Yes | Repo owner — username or organisation slug | |
| number | Yes | PR number | |
| choices | No | Hunk id → mine | main | both-mine-first | both-main-first | base | {kind:'custom', lines} | |
| content | No | The whole resolved file | |
| base_sha | Yes | baseSha from gluecron_list_pr_conflicts | |
| head_sha | Yes | headSha from gluecron_list_pr_conflicts |