mirror of
https://github.com/block/buzz.git
synced 2026-08-18 06:50:31 +02:00
9a8128ba4d
The pack branch was behind `origin/main`, and main had changed two files the pack also touches (`desktop/src-tauri/src/lib.rs`, `desktop/src/testing/e2eBridge.ts`). The pre-push branch-skew guard blocks exactly this: local gates run on a tree CI will never build, so a green local run can coexist with a red CI. Textually clean, no conflicts. Because a clean merge is precisely where two edits to one file can silently recombine, both directions were checked by content rather than by conflict count: all 342 lines the pack added to those two files are present in the merged tree, and all 17 lines main added are present too. Nothing was reverted on either side. Gated on the merged tree, which is what CI actually builds: `cargo test --lib` 2544 passed / 0 failed, `pnpm test` 4956 passed / 0 failed. Co-authored-by: Wren <5217c5c2f7bfb4333e46d17c98a9255a52dadee18dcd43a43536b95e6776dfa0@buzz.block.builderlab.xyz> Co-authored-by: Tyler Longwell <tlongwell@squareup.com> Signed-off-by: Tyler Longwell <tlongwell@squareup.com>