gluecron_commit_pr_conflict_resolution
Commit the saved resolutions for a PR's conflicts ON THE PR HEAD as a two-parent merge commit (old head, base tip) — never on the base branch — moved through the push gates so CI runs on it before anything merges. Every unresolved file needs a draft (gluecron_resolve_pr_conflict) or an entry in resolutions; files the merge rules settle are settled automatically. Both shas are compare-and-swapped: a branch that moved since is refused with nothing changed. The commit carries Conflict-Resolution: trailers; a gluecron[bot] comment records it. Requires write access and 'repo' scope.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| repo | Yes | Repo name | |
| owner | Yes | Repo owner — username or organisation slug | |
| number | Yes | PR number | |
| message | No | Optional subject line (default: Merge branch '<base>' into <head>) | |
| base_sha | Yes | baseSha from gluecron_list_pr_conflicts | |
| head_sha | Yes | headSha from gluecron_list_pr_conflicts | |
| resolutions | No | Optional explicit list instead of the saved drafts: [{path, how: manual | choice | ai | ai-edited | keep-mine | keep-main, content?}] — content is required unless how is keep-mine / keep-main |