Three way merge#134

Closed

likelion wants to merge 8 commits intoterminusdb:mainfrom

likelion:three_way_merge

Commits on May 17, 2023

Commits on May 31, 2023

added apply_merge test
likelion
committed

Commits on Jul 18, 2023

Merge branch 'main' into three_way_merge
GavinMendelGleason
authored

Commits on Nov 3, 2025

Commits on Nov 7, 2025

migrate to DashMap for concurrent layer caching, updated multiple dependencies to latest versions for compatibility and security
likelion
committed