#7210 was stacked on feat/wire-revision-signal (#7182) and was retargeted
to main after #7182 squash-merged as 5439be97b. That squash's tree is
identical to the old base tip be1f0bad72 (both 74340b751), so the only
conflict is the add/add on internal/httpapi/wireshape/BUILD.bazel, a file
both sides added relative to the pre-stack merge base 516e0b4bf0. Main's
copy is the old base copy (cdae05960), so this branch's copy (b643aa0f6,
which appends the exports_files for testdata/golden.json) is the exact
3-way result. The root BUILD.bazel auto-merged from disjoint hunks. The
merged tree equals `git merge-tree --merge-base 5439be97baaeaedc38612b29cb1b`.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>