Repository navigation

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

Merged

Re-parent with the vendored git-merge-onto instead of the merge dance#56
Phlogistique merged 6 commits into
mainfrom
use-git-merge-onto

Commits on Jun 26, 2026
- Re-parent with the vendored git-merge-onto instead of the merge dance
  
  Phlogistique
  and
  claude
  committed
  36b78a9
- Pin setup-uv to a SHA in the e2e job
  
  Phlogistique
  and
  claude
  committed
  f0835d4
- Name the merged branch in the re-parent commit message
  
  Phlogistique
  and
  claude
  committed
  58aef36
- Point the conflict comment at the live trunk; fix the e2e grep
  
  Phlogistique
  and
  claude
  committed
  d0593d0
- Make the resume verify the resolution instead of re-merging
  
  Phlogistique
  and
  claude
  committed
  81c70a9
- Fail the resume loudly when the push carries no resolution
  
  Phlogistique
  and
  claude
  committed
  ad3641e