Our great sponsors
-
InfluxDB
Power Real-Time Data Analytics at Scale. Get real-time insights from all types of time series data with InfluxDB. Ingest, query, and analyze billions of data points in real-time with unbounded cardinality.
I implemented a three direction diff at https://github.com/samsquire/text-diff
Conflict detection is fairly hard to get right, I can detect overlapping ranges to colour the output green or red.
Using this guide https://blog.jcoglan.com/2017/02/12/the-myers-diff-algorithm...
This made me think of a couple other interesting things:
1. you can change which algorithm is used in git diff as multiple are supported
https://luppeng.wordpress.com/2020/10/10/when-to-use-each-of...
2. Google has an edit graph implementation in Go in the cmp package
https://github.com/google/go-cmp/blob/master/cmp/internal/di...