Skip to content

πŸ› Control base-refresh churn without blocking ready successors - #15836

Merged
clubanderson merged 4 commits into
v5from
fix/l6-front-only-base-refresh
Oct 30, 2026
Merged

clubanderson merged 4 commits into
v5from
fix/l6-front-only-base-refresh

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Fixes #15833

Owner-approved outcome

One final base-refresh owner per destination repository/base across App, trusted-author and contributor lanes. Waiting heads develop/review normally, without repeatedly merging the base into every head. A successor already current-base, CI-green and reviewed bypasses an unready preparation owner under every existing merge gate. Behind successors cannot bypass testing.

Design

  • Separate durable preparation from merge-ready train seats. Admit after existing CI/review/lane gates but before strict current-base readiness (no circular eligibility). Expected refreshed-head pending checks/reviews keep preparation, never a green/ready train seat.
  • Canonical repo + case-sensitive base key; durable per-destination flock + atomic fsynced snapshot under /data/base-preparation/; write-ahead head/base identity and expected-head mutation guard deduplicate concurrent lanes/sweeps/restarts. FIFO admission tickets keep provenance; only a caller freshly qualifying its head becomes owner, not a stale ticket.
  • Release on merge, failed/rejected/held/closed/gone/conflicting/retargeted/draft/lost admission; existing review-pending dwell bounds hung ownership. Other lanes cannot revoke the admitting lane's reservation. Ambiguous writes reconcile using the existing mutation TTL.
  • Route early behind, required-check fallback, train sibling refreshes, adoption recovery and explicit trusted-human merge-forward through shared ownership. Client follow-up/relay/supersession refreshes defer to the scheduler on current-base-policy repos. Non-policy behavior remains unchanged.
  • Preserve all required checks, sign-off, review, hold, authorization, intent, soak, min-head-age, current-head and current-base gates. No agent/memory/config/workflow reductions. Queued sign-off is pending, not missing DCO or failure.

Related, not duplicate: #15825 / #15831 own ready-only train seating/ejection; #15823 owns reviewer scheduling. Train touch points here only exclude preparing owners and stop blanket sibling base merges. No managed PR/issue edits beyond this issue and PR.

Observability and rollout

automerge base preparation selected, automerge base preparation refresh claimed, automerge base preparation waiting, automerge base preparation released include repo/base/PR plus head/base SHA or cause. Machine reasons base-refresh:queued-behind#N, base-refresh:preparing, base-refresh:snapshot-changed, base-refresh:state-unavailable; stage/caption stays CI / Review, not ready. Existing automerge update-branch and updated_branches remain refresh signals. Deploy the changed hive binary after review/CI; no rollout or live edits performed here.

Human/direct/external writers may still move the base. Preparation coalesces moves while its CI/review is pending, then requalifies and refreshes again if needed; this cannot prevent external writes or authorize stale-tested merges.

Review and validation

Read-only code-review agent completed before commit; addressed lane-provenance revocation, stale-ticket promotion and explicit merge-forward repair findings, with regressions. Local validation is gofmt only plus patch inspection, per AGENTS.md; no local Go tests/build/vet/lint/docs guards run. CI is the sole verdict; results will be updated here.

Regression coverage: multiple pending PRs/repeated sweeps, sticky preparing head, lane provenance, FIFO/head-change requalification, closed/gone/hold/draft/conflict/retarget/red/rejected/withdrawn/expired release, distinct repo/base and canonical casing, concurrent independent store instances/pod restart dedup, pinned-head/base changes, persistence fail-closed, opted-out behavior, repair serialization, non-ready stage/caption, and fully gated current-base successor merging while preparation CI is queued with negative CI/review controls. No new sleeps.

Do not merge or deploy this PR automatically as part of this handoff. No /approve or /lgtm requested by this implementation agent.

Signed-off-by: Andy Anderson <andy@clubanderson.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 30, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign kellyaa for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubestellar-prow kubestellar-prow Bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 30, 2026
@github-actions

github-actions Bot commented Oct 30, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

Conflicts are checked with every PR merged onto the current tip of v5, so a PR that only needs a rebase is not reported as conflicting with its siblings.

PR Title Relation Files
#15819 🌱 refactor: split src/pkg/github/automerge/automerge_sweep.go into 4 files CONFLICT src/pkg/github/automerge/automerge_sweep.go
#15831 πŸ› Merge train seats only PRs green and reviewed on their current head; regressed members are ejected same files src/docs/hive-merge.md
src/pkg/github/automerge/automerge_contributor_lane.go
src/pkg/github/automerge/automerge_merge_train.go
src/pkg/github/automerge/automerge_sweep.go
src/pkg/stageengine/derive_pr_classify.go
#15748 πŸ› [reviewer] park PRs at 085 Needs decision when the fixer exhausted its attempts same files src/docs/hive-merge.md
src/pkg/github/automerge/automerge_stage_labels.go
src/pkg/github/automerge/automerge_sweep.go
src/pkg/stageengine/derive_pr_classify.go
#15817 πŸ› activity monitor: 'merging now' lingers, silent merges, closed rows vanish same files src/pkg/github/automerge/automerge_contributor_lane.go
src/pkg/github/automerge/automerge_sweep.go
#15757 ✨ Auto-merge hive-authored superseding PRs without operator decision same files src/docs/hive-merge.md
src/pkg/github/automerge/automerge_sweep.go
src/pkg/github/client.go
#15781 πŸ› automerge: withdraw native-queue entries on release freeze and human merge path same files src/pkg/github/automerge/automerge_native_queue_test.go

@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 30, 2026
Signed-off-by: Andy Anderson <andy@clubanderson.com>
@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission β†’ 050-review-pending: required-check-pending:Sign-off survives the squash

Signed-off-by: Andy Anderson <andy@clubanderson.com>
@clubanderson

Copy link
Copy Markdown
Member Author

CI iteration on 4403944 identified two compatibility gaps in test (rest 1/4): actual refused stale-red update attempts must retain their existing accounting, while scheduler-deferred requests must not consume the recovery budget; and native-queue fixtures must provide the live base identity required for pinned refreshes. Corrected both and added queued/deduplicated recovery-budget regressions. Native-queue coverage now also explicitly confirms that current green heads enqueue without refresh. No gate was relaxed. Awaiting authoritative CI on the new head; no local test/build/lint suites run.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission β†’ 050-review-pending: required-check-pending:Sign-off survives the squash

@github-actions github-actions Bot added conflicts-with-open-pr Open PR has a merge conflict with another open PR and removed conflicts-with-open-pr Open PR has a merge conflict with another open PR labels Oct 30, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Security review (head 40875f6) β€” no blocking findings. Two low advisories:

  1. Contributor-lane owner can hold the shared refresh slot by pushing (src/pkg/github/automerge/automerge_base_preparation.go:217-226, :98-113). preparationKeepsOwner keeps ownership on head-changed-since-eval / contributorLaneReasonNoVerdict, and the owner's liveness check passes expectedHead="" (:111), so a fork PR that once passed review+CI can push fresh commits and remain owner, parking every behind App/trusted PR on that base. Bounded by preparationWindow() (ReviewPending dwell, 1h default β€” src/pkg/stagelabels/stagelabels.go:269) and the issue explicitly admits all lanes, so this is accepted design; flagging the trust coupling for the record. If you want to tighten it cheaply, treat an owner head change as a release:

    	if expectedHead != "" && pr.GetHead().GetSHA() != expectedHead {
    		return "head-changed-before-preparation", nil
    	}
    

    and pass st.Owner.Head instead of "" at :111 (owner then re-queues via the normal FIFO once the new head re-qualifies).

  2. State files group-writable (src/pkg/github/automerge/base_preparation_store.go:81-82): 0o775/0o664 under /data/base-preparation/, while the sibling stage store uses 0o755/0o644 (src/pkg/stagelabels/store.go:598,602). Group write on the shared durable volume lets any same-group process alter/corrupt ownership (corruption fails closed per :107, tampering does not). Suggest matching the stage store:

    	const directoryMode = 0o755
    	const fileMode = 0o644
    

Checked and fine: snapshot paths are sha256(key) (no traversal from repo/base refs); corrupt JSON fails closed; behind heads can never merge (currentBaseGate stops on every admission/refresh outcome, automerge_current_base.go:104-122); mergeReviewGate is added before the gate, not moved; engine update-branch uses go-github directly (automerge_sweep.go:2689) so the new Client.updateBranch refusal (pullrequest.go:601) doesn't self-block.

β€” hive: agent=adjudicator-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Hive filed review findings that do not block this PR as backlog items:

Cap: 10 backlog item(s) per PR per day.

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style review (head 40875f6) β€” no blockers; three maintainability notes, worst first.

  1. base-refresh: reasons bypass the stageengine/prstage shared-reason idiom. The repo's convention for a reason the sweep writes and the stage engine + dashboard read is a prstage prefix/state constant and parser (src/pkg/stageengine/prstage/merge_train.go:9-26, consumed via stageengineprstage.* in src/pkg/dashboard/stage_tracker_caption.go:55,379,388 and prstage.ParseMergeTrain in derive_pr_classify.go). This PR instead hardcodes the wire format in four packages: unexported basePreparationPrefix in src/pkg/github/automerge/automerge_base_preparation.go:21, string literals in src/pkg/stageengine/derive_pr_classify.go:375, src/pkg/dashboard/stage_tracker_caption.go:317,323, and src/pkg/github/pullrequest.go:602 (base-refresh:awaiting-admission). The snapshot-changed/state-unavailable suffixes are also rebuilt inline at automerge_base_preparation.go:180,255, automerge_current_base.go:117, automerge_sweep.go:2598. Suggest a prstage block the other three packages import:

    // src/pkg/stageengine/prstage/base_refresh.go
    const (
    	BaseRefreshReasonPrefix        = "base-refresh:"
    	BaseRefreshStatePreparing      = "preparing"
    	BaseRefreshStateQueuedBehind   = "queued-behind#"
    	BaseRefreshStateSnapshotChanged = "snapshot-changed"
    	BaseRefreshStateStateUnavailable = "state-unavailable"
    	BaseRefreshStateAwaitingAdmission = "awaiting-admission"
    )
  2. forgetRejectedPreparationUpdate drops the caller's ctx and the REST-caller tag. src/pkg/github/automerge/automerge_base_preparation.go:214-217 does c.gh.PullRequests.Get(context.Background(), …) although its only caller, executeUpdateBranchEffect (automerge_sweep.go:2664,2702), has ctx in hand, and every other PullRequests.Get in this file wraps with hgithub.WithRESTCaller(ctx, "hive:base_preparation…") (:118,:173). A cancelled sweep keeps issuing this GET, and it is the one base-preparation call invisible to per-caller REST accounting.

    func (c *Engine) forgetRejectedPreparationUpdate(ctx context.Context, owner, repo string, number int, head string) {
    	// A synchronous refusal cannot have applied the write. Forget only our
    	// reservation; the mutation journal still owns ambiguous reconciliation.
    	pr, _, err := c.gh.PullRequests.Get(hgithub.WithRESTCaller(ctx, "hive:base_preparation_forget"), owner, repo, number)
    

    and c.forgetRejectedPreparationUpdate(ctx, owner, repo, number, headSHA) at automerge_sweep.go:2702.

  3. Lane provenance is a variadic with a silent default. currentBaseGate(..., admissionLane ...string) at src/pkg/github/automerge/automerge_current_base.go:92,113-116 falls back to stageLaneSelf when omitted. All three production callers pass a lane explicitly (automerge_sweep.go:2002,2484, automerge_contributor_lane.go:1461); only the test helper at automerge_base_preparation_test.go:140 omits it. Since lane provenance decides whether a release is honoured (observeBasePreparation, automerge_base_preparation.go:251-270; TestBasePreparationProvenanceForEveryAdmittingLane), a future caller that forgets the argument gets wrong provenance with no compile error. Make it a required lane string parameter and pass stageLaneSelf from the test helper.

β€” hive: agent=adjudicator-5 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docs currency β€” reviewed at head 40875f6.

1. review.contributor_prs.base_sync docs no longer match what the setting does (medium). src/cmd/hive/prfollowupwire.go:168 now returns false from BaseSyncEnabled whenever cfg.AutoMerge.RequireCurrentBaseFor(repo) is true, so on current-base-gated repos the setting is silently a no-op and PR follow-up defers to the preparation owner. The two operator-facing descriptions of the setting still say unconditionally that it "lets PR follow-up call GitHub's update-branch API":

  • src/docs/operator-reference.md:249 (review.contributor_prs.base_sync row)
  • src/docs/review-swarm.md:560

hive-merge.md mentions the deferral only in passing ("client-side follow-up/relay/supersession updates defer to preparation"); an operator reading the setting's own reference row will not find it. Suggested addition to the end of both passages:

-...the repository's "Sign-off survives the squash" check examines the PR's own commits, not GitHub's update-branch merge commit. |
+...the repository's "Sign-off survives the squash" check examines the PR's own commits, not GitHub's update-branch merge commit. On a repository where the current-base gate is on (`auto_merge.require_current_base` / `require_current_base_default`), this setting is ignored: follow-up defers to the automerge base-preparation owner described in [hive-merge.md](hive-merge.md#final-base-preparation-one-refresh-owner-no-ready-work-blockade). |

2. auto_merge.require_current_base row describes the pre-PR refresh behavior (low). src/docs/operator-reference.md:438 still says a behind green head "is updated with GitHub update-branch ... and merges once CI is green"; after this PR it is admitted to a single per-repo/base preparation owner and may instead sit at base-refresh:queued-behind#N (src/pkg/github/automerge/automerge_current_base.go hunk at preparationGate, derive_pr_classify.go:375). One sentence pointing at the new hive-merge.md section would keep the setting reference accurate.

3. Machine-reason spelling drift (low). The PR body and the new base-refresh: prefix handling (derive_pr_classify.go:375, stage_tracker_caption.go:317) use base-refresh:state-unavailable, but src/pkg/github/automerge/automerge_adoption_recovery.go:226 emits "base-refresh-state-unavailable" (hyphen), which neither the classifier prefix check nor the humanizer recognizes. Also base-refresh:snapshot-changed / base-refresh:state-unavailable, listed in the PR body as machine reasons, are absent from the new hive-merge.md section (src/docs/hive-merge.md:379-380 names only preparing and queued-behind#N).

				return adoptionRecoverySkipped(nonEmpty(reason, basePreparationPrefix+"state-unavailable"))

β€” hive: agent=ci-maintainer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correctness review (head 40875f6)

Review gate now evaluated twice per tick on current-base-policy repos β€” src/pkg/github/automerge/automerge_sweep.go:1999 (self lane) and :2481 (trusted lane) add an early mergeReviewGate call before currentBaseGate, while the original call at :2050 / :2509 still runs on the re-verified head immediately before merge. The head is guaranteed identical between the two calls (head-changed-since-eval guard at :2044-2046), so on every tick where a green head reaches the merge call, mergeReviewGate (automerge_review_gate.go:235-299) runs its side effects twice: RecordEvaluation emits two self-merge review gate evaluated audit lines (cmd/hive/review_gate.go:108-114), RecordShadow re-signs/merges the shadow evidence twice, and in enforce mode with !priorChecked latestTrustedHumanApproval fetches reviews twice (automerge_review_gate.go:258-260). Since current-base is the hive-wide default (#15335), this doubles review-gate audit/metric counts for essentially all lanes. The early call is justified (keeps an unreviewed head out of preparation), so skip the later one when the early one already cleared this head:

--- a/src/pkg/github/automerge/automerge_sweep.go
+++ b/src/pkg/github/automerge/automerge_sweep.go
@@ trySweepSelfAuthoredPR
+	reviewGated := false
 	if c.requireCurrentBaseFor(owner+"/"+repo) && !queueSkipsBase() {
 		if reviewReason := c.mergeReviewGate(ctx, displayRepo, owner, repo, lane, number, pr, evaluatedHeadSHA, priorApprover, priorChecked); reviewReason != "" {
 			return AutoMergeSweepEvent{}, reviewReason, nil
 		}
+		reviewGated = true
 		if ev, reason, stop, err := c.currentBaseGate(...); stop {
 			return ev, reason, err
 		}
 	}
@@
-	if reviewReason := c.mergeReviewGate(ctx, displayRepo, owner, repo, lane, number, current, evaluatedHeadSHA, priorApprover, priorChecked); reviewReason != "" {
-		return AutoMergeSweepEvent{}, reviewReason, nil
+	if !reviewGated {
+		if reviewReason := c.mergeReviewGate(ctx, displayRepo, owner, repo, lane, number, current, evaluatedHeadSHA, priorApprover, priorChecked); reviewReason != "" {
+			return AutoMergeSweepEvent{}, reviewReason, nil
+		}
 	}

Same shape for trySweepTrustedAuthorPR (:2481 / :2509). A test asserting a single RecordEvaluation per tick on a policy repo would pin it.

β€” hive: agent=adjudicator backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intent alignment (read at head 40875f6, against #15833)

The engine-side design matches the issue: all three lanes route the behind refresh through admitBasePreparation (automerge_current_base.go:111-117), the early behind shortcuts are disabled on policy repos (automerge_sweep.go:1920, :2426; automerge_contributor_lane.go:1385), already-current heads return before admission (automerge_current_base.go:104-108), the preparing owner is excluded from train seats (automerge_merge_train.go:426) and sibling refreshes are stopped (:784). One gap between the body and the diff:

1. [medium] Operator "merge now / rebase-then-merge" from the dashboard now routes hive-authored behind PRs to a fixer-agent rebase instead of update-branch

Client.updateBranch refuses unconditionally on policy repos (src/pkg/github/pullrequest.go:601-603). The PR body and base_refresh_policy.go:3-5 scope this to "follow-up, merge relay, supersession", but the same method backs two operator-solicited dashboard paths: rebase_merge_followthrough.go:113 (armRebaseThenMerge) and api_repo_item_decision.go:782 (queueRebaseOnApprove). Both catch the error, log "leaving the rebase to the fixer", and keep the episode armed; cmd/hive/merge_eligibility.go:1157-1160 then routes every armed PR to a fixer agent for a manual rebase. Net effect on policy repos: a human's merge-now on a merely-behind hive PR consumes a fixer agent and pushes a fresh head outside the preparation owner β€” the kind of unserialized refresh #15833 is trying to remove β€” and the PR's own text does not state this behavior change. Suggested fix: let solicited callers bypass the scheduler:

--- a/src/pkg/github/pullrequest.go
+++ b/src/pkg/github/pullrequest.go
@@ func (c *Client) UpdateBranch(ctx context.Context, repo string, number int) error {
-	return c.updateBranch(ctx, repo, number, "", "")
+	return c.updateBranch(ctx, repo, number, "", "", false)
 }
+
+// UpdateBranchSolicited is UpdateBranch for an operator-initiated action
+// (dashboard merge-now / approve). It is not an automatic refresh, so it
+// does not defer to the automerge preparation front.
+func (c *Client) UpdateBranchSolicited(ctx context.Context, repo string, number int) error {
+	return c.updateBranch(ctx, repo, number, "", "", true)
+}
@@ func (c *Client) UpdateBranchExpectedHead(...) error {
-	return c.updateBranch(ctx, repo, number, expectedHeadSHA, observedBaseSHA)
+	return c.updateBranch(ctx, repo, number, expectedHeadSHA, observedBaseSHA, false)
 }
@@
-func (c *Client) updateBranch(ctx context.Context, repo string, number int, expectedHeadSHA string, observedBaseSHA string) error {
+func (c *Client) updateBranch(ctx context.Context, repo string, number int, expectedHeadSHA string, observedBaseSHA string, solicited bool) error {
@@
-	if c.baseRefreshScheduled(owner + "/" + repo) {
+	if !solicited && c.baseRefreshScheduled(owner + "/" + repo) {
 		return fmt.Errorf("base-refresh:awaiting-admission: ...")
 	}

and switch rebase_merge_followthrough.go:113 and api_repo_item_decision.go:782 to gh.UpdateBranchSolicited(...) (plus a test in base_refresh_policy_test.go). Alternatively, document the dashboard redirection in the PR body/hive-merge.md if it is intended β€” but a fixer push per operator merge-now looks contrary to the issue's goal.

2. [low, advisory] mergeReviewGate now runs twice per tick on policy repos β€” automerge_sweep.go:1999 then :2050 (trusted: :2481 then :2509). It calls StartReviewEvidence and RecordEvaluation (automerge_review_gate.go ~L280-290), so each sweep tick records two evaluations for the same head/lane. Harmless for gating; worth a priorReviewOK short-circuit or accepting the duplicate metric.

β€” hive: agent=adjudicator-3 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@clubanderson

Copy link
Copy Markdown
Member Author

Pairwise integration check with #15831 (fixes #15825)

Checked #15836 head 40875f6690e672bd39ce897fe0e8c37a0de49c7c against #15831 head 4a5802a3fd0872f605bd43b05db2fe35e7c774ff, common ancestor 859b06e3dbc8da131276059132c943557ee8fea0.

The fixes are complementary, not a hard compile dependency. Existing regressions cover fully gated ready-successor bypass, CI/review negative controls and preparation stage classification; #15831 separately covers ready-only seating/ejection. Combined-tree test execution has not occurred: repository rules require CI, and current-head CI remains pending. Neither PR was merged or deployed; #15831 was not modified.

Signed-off-by: Andy Anderson <andy@clubanderson.com>
@clubanderson

Copy link
Copy Markdown
Member Author

Pushed DCO-signed fixture-only correction d52d77a5cb301a7cf4ba58ba3a645623ce74d260 (one test file, nine added lines). CI job 124213760336 showed all eight native-queue/current-base table cases stopped at an unhandled GET /branches/main. Supplying the base ref in the prior correction also activated release-hold and required-context discovery, so this patch supplies all four companion endpoints: branch tip, base-tip combined status, branch protection, and branch rules. Existing head CI checks and strict current-base/update/enqueue assertions remain unchanged. No production code, policy, gate, base refresh, or unrelated changes. gofmt and whitespace inspection only; new-head CI is authoritative and pending. No merge or deployment performed.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission β†’ 050-review-pending: required-check-pending:Sign-off survives the squash

@clubanderson
clubanderson merged commit be04a9c into v5 Oct 30, 2026
73 of 74 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the fix/l6-front-only-base-refresh branch October 30, 2026 18:37
@github-actions

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

hivecommons-hive Bot added a commit that referenced this pull request Oct 30, 2026
Port the #15836 base-preparation hunks that landed in the moved
trySweepSelfAuthoredPR/trySweepTrustedAuthorPR/updateBranchAndSkip/
executeUpdateBranchEffect bodies into automerge_sweep_trusted.go.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflicts-with-open-pr Open PR has a merge conflict with another open PR dco-signoff: yes Indicates the PR's author has signed the DCO. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

πŸ› Serialize final base preparation to stop waiting-head CI churn

1 participant