Skip to content

merge: a head already on main is reported, nothing logged - #103

Merged
hhff merged 3 commits into
mainfrom
merge-once
Nov 5, 2026
Merged

hhff merged 3 commits into
mainfrom
merge-once

Conversation

@hhff

@hhff hhff commented Nov 5, 2026

Copy link
Copy Markdown
Member

What

  • scripts/devteam.mjs merge: after resolving the PR's head, it fetches main. If the head is already on main, it prints <branch> at <sha> is already on main: nothing to merge, nothing logged and stops. It doesn't land anything or write an act.
  • test/kit.test.mjs: merging bill-01-card a second time reports this, and the act count doesn't change.

Why

stacksbot's supervisor saw a stale background job run merge --chore log on a chore-log PR that had already merged. It reported "merged" and logged a second merge-chore act for the same sha (13909e23: a-20261105-034848643 and a-20261105-035351956). I verified both in stacksbot's log. gh pr view still returns a merged PR, so nothing stopped it.

Authority

This only removes a duplicate record; nothing is authorized differently.

Migration

None.

🤖 Generated with Claude Code

hhff and others added 2 commits November 4, 2026 23:41
stacksbot's stale background job ran merge --chore log on a chore-log PR that had merged: it said
merged and logged a second merge act for the same sha. merge now fetches main first and stops when
the head is already in it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@hhff

hhff commented Nov 5, 2026

Copy link
Copy Markdown
Member Author

Merging (upstream loop). Review: author's own PR; the authority reasoning is in the body. Tested in the combined branch (main + #100 + #103 + #104 + #107 + #113): local Node 24.14.1, 20.19.6 and 18.20.4 each 90/90. CI 18/20/22/24 green at this head, with main (#100) merged in.

@hhff
hhff merged commit 234a9bc into main Nov 5, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant