mirror of
https://github.com/block/buzz.git
synced 2026-08-18 06:50:31 +02:00
SamiandTyler Longwell
4b9508c52e
Base advanced to 21e8e58ce (Max's main merge for #3266), which conflicted
with #2467's workspace-member additions in three files.
Resolutions:
- Justfile, scripts/run-tests.sh: both sides inserted a test lane at the
same line against an empty merge base (#2467 adds buzz-voice, main adds
buzz-cli). Resolved as a union of both lanes. Taking either side alone
would silently delete the other's CI lane while CI stayed green.
- Cargo.lock: started from the new base's lockfile and let Cargo complete
resolution from the merged manifests. Purely additive -- 35 packages
added for buzz-voice's subtree, 0 dropped, 0 downgraded.
Verified: no package dropped from the base graph, no version removed, and
cargo check --locked -p buzz-voice --all-targets passes, proving the
lockfile is complete rather than silently rewritten.
Co-authored-by: Tyler Longwell <tlongwell@block.xyz>
Signed-off-by: Tyler Longwell <tlongwell@block.xyz>