Skip to content

Commit

Permalink
Update README.md with recursive 3-way merge refs
Browse files Browse the repository at this point in the history
  • Loading branch information
toomim authored Jan 5, 2024
1 parent 888afb4 commit 26ce303
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# diffsync
This implements a simple collaborative editor for the web

It implements collaborative text editing via git's recursive 3-way merge algorithm. This is how git merges big commits of source code. I bet you never thought it could be used for merging single-keystroke edits together!
It implements collaborative text editing via git's [recursive 3-way merge algorithm](https://public-inbox.org/git/[email protected]/). This is how git merges big commits of source code. I bet you never thought it could be used for merging single-keystroke edits together!

It's actually remarkable fast, too, because it uses the amazing Myer's algorithm for the diffing!

See the index.html file for an example usage.

We [hypothesize](https://stackoverflow.com/a/48652362/440344) that this algorithm actually can be proven to be a CRDT, by observing that each recursive merge creates a least-upper-bound within a semilattice.

0 comments on commit 26ce303

Please sign in to comment.