-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update README.md with recursive 3-way merge refs
- Loading branch information
Showing
1 changed file
with
3 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |