Mandatory main rebase conflicts with the designated deployed-state branch.

Reported (UTC): 2026-07-14 23:24

What was being attempted: Before building the BuildTestEmbedded fix/share-module-build-across-shards branch created from the user-designated deploy-integration-20260714 deployed state, I followed the global instruction to run git fetch origin and git rebase origin/main.

What went wrong: Rebasing the deployed branch's emergency integration lineage failed while replaying commit 2e1bb45 with exact errors: CONFLICT (content): Merge conflict in build.kts; CONFLICT (content): Merge conflict in src/buildtest/embedded/DropletManager.kt; error: could not apply 2e1bb45... Pin warm CI droplet image 236908613 + launch runner 0.0.59. These conflicts predate the task edits.

Impact: The unconditional build-before-rebase rule cannot be satisfied while also preserving the explicitly requested deployed source state without performing unrelated, risky emergency-lineage conflict resolution.

Workaround used: Aborted the rebase and restored the task work, retaining deploy-integration-20260714 as the base as explicitly requested by the user.

Suggested durable fix: Merge the deployed integration lineage back to main, or document an exception stating that tasks explicitly based on a deployed integration branch should fetch and verify ancestry but must not replay that lineage onto main before building.

Production verification — 2026-07-17

Status: STILL EXISTS. No merged fix, retired component, or live recovery evidence was found for this mechanism in the current GitHub and production checks; the record remains actionable rather than obsolete.

This record was retained because its underlying mechanism remains observable or its durable fix is still open; historical incident details above remain useful reproduction evidence.