#Ataraxy-labs

# Same merge, with weave configured $ git merge feature-b weave [src/lib.ts]: 2 entities matched, 2 modified, 0 conflicts Merge made by the 'ort' strategy. # Different functions = no conflict.

Semantic understanding on top of Git. Diff, blame, impact, log. Functions, not lines.