andras/reconcile
1
0
Fork 0
Code Issues Pull requests 5 Projects Releases Packages Wiki Activity Actions

Fix typos and clarify

Browse source
This commit is contained in:
Andras Schmelczer 2025-07-12 22:12:19 +01:00
parent 61bea53b7c
commit 86825c177b
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
5 changed files with 39 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

12
examples/website/src/index.html
View file

@ -58,16 +58,16 @@
The <code>reconcile(parent, left, right)</code> function takes conflicting
edits and produces clean, unified results using an algorithm inspired by
Operational Transformation. No more
<code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</code> markers jumbling your text.
<code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</code> markers cluttering your text.
</p>
<p>
The process starts with your chosen tokenisation strategy, then applies Myers'
2-way diff algorithm to compare the original with both modified versions.
These diffs are optimised and transformed to preserve the longest meaningful
changes, before a final merge strategy combines all inserts and deletes
without losing any edits. Cursor positions may be tracked and updated during
merging too.
changes, before a final merge strategy combines all insertions and deletions
without losing any edits. Cursor positions can be tracked and updated during
merging as well.
</p>
<p>
@ -79,8 +79,8 @@
>documentation</a
>
or try editing the text boxes below to see <code>reconcile-text</code> in
action. Use the tokenisation options to experiment with different approaches —
the Rust library also supports providing a custom tokeniser.
action. Use the tokenisation options to experiment with different approaches—
the Rust library also supports custom tokenisers.
</p>
</header>