Loading
Trylle
Search
Explore
Sign up
Create an account
Sign In
Loading
Sign in
vercel-labs
vercel-labs
/
zerolang
zerolang
Public
Synced
Pull mirror status: ok
Code
Code
Issues
54
Pull Requests
82
Releases
0
Actions
Actions
Commits · feat: implement graph diff, 3-way merge, and auto-merge (#348-PR2-8) · vercel-labs/zerolang | Trylle
#377
Code
Commits on Thu, Jun 4, 2026
T
Thomas Bale
Make lowering BLD004 diagnostics target-aware
84f5245
Jun 4
Code
T
Thomas Bale
Merge remote-tracking branch 'origin/main' into fix/target-aware-lowering-diagnostics
bcb293f
Jun 4
Code
T
Thomas Bale
Accept underscores in float literals (B5)
37b6987
Jun 4
Code
T
Thomas Bale
Reject unknown escapes in string literals (A2/A3/B8)
c151d33
Jun 4
Code
T
Thomas Bale
Restrict char `\xNN` to ASCII range (B6)
d16c9f3
Jun 4
Code
T
Thomas Bale
feat: add zero graph diff command for node-level changeset
6510408
Jun 4
Code
T
Thomas Bale
feat: implement 3-way merge detection and auto-merge
8c5db4d
Jun 4
Code
T
Thomas Bale
feat: implement PR5-8 for trivial convergences, field disjoint, move-aware, semantic checks
5abdf3a
Jun 4
Code
T
Thomas Bale
Merge origin/main into fix/348-pr3-collision-detection
e6a8577
Jun 4
Code
T
Thomas Bale
fix(merge): report mergedFile=null on shape validation failure
be3a3ba
Jun 4
Code
Public