Merge src/root.zig with the union driver #792
Loading…
Reference in a new issue
No description provided.
Delete branch "root-union"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Merge src/root.zig with the union driver
src/root.zigchanged 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 theloop's rebase stopped. With
merge=unionboth added lines are kept. A union of two edits of the same other linekeeps 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.