Merge src/root.zig with the union driver #792

Manually merged
binjovi-bot merged 1 commit from root-union into trunk 2026-11-13 12:56:01 +00:00
Owner

Merge src/root.zig with the union driver

src/root.zig changed in 21 of the 28 releases v0.1.480 to v0.1.508, almost always by one added
_ = @import("..._test.zig"); line of a new test file. Two lanes that each add a test file conflicted on it and the
loop's rebase stopped. With merge=union both added lines are kept. A union of two edits of the same other line
keeps both lines; the next build fails on it at once, so such a merge cannot pass unseen.

Gates

ship.sh ok (census 645/0, emit and twins gates clean, full check passed). No source change, so gate.sh has nothing to compare.

# Merge src/root.zig with the union driver `src/root.zig` changed in 21 of the 28 releases v0.1.480 to v0.1.508, almost always by one added `_ = @import("..._test.zig");` line of a new test file. Two lanes that each add a test file conflicted on it and the loop's rebase stopped. With `merge=union` both added lines are kept. A union of two edits of the same other line keeps both lines; the next build fails on it at once, so such a merge cannot pass unseen. ## Gates ship.sh ok (census 645/0, emit and twins gates clean, full check passed). No source change, so gate.sh has nothing to compare.
Merge src/root.zig with the union driver
All checks were successful
binjovi/ci Binjovi completed the frozen plan
5a4238ac10
binjovi-bot manually merged commit 5a4238ac10 into trunk 2026-11-13 12:56:01 +00:00
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
sean/sourcerer!792
No description provided.