Better callouts
This commit is contained in:
parent
3ebcd845a6
commit
d6b9e0b9c5
5 changed files with 19 additions and 5 deletions
|
|
@ -6,7 +6,7 @@ A Rust, TypeScript, and Python library for merging conflicting text edits withou
|
|||
|
||||
✨ **[Try the interactive demo][8]** to see it in action!
|
||||
|
||||
> Or read my [blog post](https://schmelczer.dev/articles/reconcile-text-3-way-merge/) on it!
|
||||
For the motivation and algorithm behind the library, read [Conflict-Free Three-Way Text Merging](https://schmelczer.dev/articles/reconcile-text-3-way-merge/).
|
||||
|
||||
### Install it in your project
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
# Advanced Usage (Python)
|
||||
|
||||
For the motivation and algorithm behind the library, read
|
||||
[Conflict-Free Three-Way Text Merging](https://schmelczer.dev/articles/reconcile-text-3-way-merge/).
|
||||
|
||||
## Edit Provenance
|
||||
|
||||
Track which changes came from where using `reconcile_with_history`:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
# Advanced Usage (TypeScript)
|
||||
|
||||
For the motivation and algorithm behind the library, read
|
||||
[Conflict-Free Three-Way Text Merging](https://schmelczer.dev/articles/reconcile-text-3-way-merge/).
|
||||
|
||||
## Edit Provenance
|
||||
|
||||
Track which changes came from where using `reconcileWithHistory`. The result's
|
||||
|
|
|
|||
|
|
@ -78,14 +78,20 @@
|
|||
</p>
|
||||
|
||||
<p>
|
||||
Ready to dive deeper? Check out the
|
||||
Ready to dive deeper? Read
|
||||
<a
|
||||
href="https://schmelczer.dev/articles/reconcile-text-3-way-merge/"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>Conflict-Free Three-Way Text Merging</a
|
||||
>
|
||||
for the motivation and algorithm, browse the
|
||||
<a
|
||||
href="https://git.schmelczer.dev/andras/reconcile"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>documentation</a
|
||||
>
|
||||
or try editing the text boxes below to see <code>reconcile-text</code> in
|
||||
>, 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 custom tokenisers.
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -207,7 +207,9 @@
|
|||
//!
|
||||
//! ## Algorithm overview
|
||||
//!
|
||||
//! For detailed algorithm explanation, see the
|
||||
//! For the motivation and algorithm behind the library, read
|
||||
//! [Conflict-Free Three-Way Text Merging](https://schmelczer.dev/articles/reconcile-text-3-way-merge/).
|
||||
//! For a shorter overview, see the
|
||||
//! [README](https://git.schmelczer.dev/andras/reconcile/blob/main/README.md#how-it-works).
|
||||
|
||||
mod operation_transformation;
|
||||
|
|
|
|||
Loading…
Reference in a new issue