Re-parent with the vendored git-merge-onto instead of the merge dance#56

Merged

Phlogistique merged 6 commits into

mainfrom

use-git-merge-onto

Jun 26, 2026

Commits on Jun 26, 2026

Re-parent with the vendored git-merge-onto instead of the merge dance

Phlogistique
and
claude
committed
Pin setup-uv to a SHA in the e2e job

Phlogistique
and
claude
committed
Name the merged branch in the re-parent commit message

Phlogistique
and
claude
committed
Point the conflict comment at the live trunk; fix the e2e grep

Phlogistique
and
claude
committed
Make the resume verify the resolution instead of re-merging

Phlogistique
and
claude
committed
Fail the resume loudly when the push carries no resolution

Phlogistique
and
claude
committed