mergiraf/mergiraf
mergiraf/mergiraf
9
213
Fork 45
Code Issues 50 Pull requests 7 Releases 19 Activity Actions

fix(TreeBuilder): resolve not-really-conflicts (left and right agree), take 2 #204

Merged
ada4a merged 4 commits from ada4a/mergiraf:170-not_really_a_conflict-v2 into main 2025-02-15 11:24:58 +01:00
Conversation 2 Commits 4 Files changed 2 +100 -24

4 commits

Author SHA1 Message Date
Ada Alakbarova
1b1ce78565 comment
All checks were successful
/ test (pull_request) Successful in 47s
Details
2025-02-12 19:41:18 +01:00
Ada Alakbarova
78961bc97f after creating the conflict, check if its left and right sides are entirely isomorphic
All checks were successful
/ test (pull_request) Successful in 52s
Details
2025-02-12 17:30:07 +01:00
Ada Alakbarova
28419401f9 misc: use let-else 
similar to the "1 successor" branch
 2025-02-12 17:30:07 +01:00
Ada Alakbarova
60d399929e add failing test 2025-02-12 17:30:07 +01:00