andras/reconcile
andras/reconcile
Watch
1
0
Fork
You've already forked reconcile
 0
Code Issues Pull requests 10 Projects Releases Packages Wiki Activity Actions

Better callouts

Browse source
This commit is contained in:
Andras Schmelczer 2026-10-27 18:43:09 +00:00
commit d6b9e0b9c5
5 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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! ✨ **[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 ### Install it in your project

3
docs/advanced-python.md
View file

@ -1,5 +1,8 @@
# Advanced Usage (Python) # 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 ## Edit Provenance
Track which changes came from where using `reconcile_with_history`: Track which changes came from where using `reconcile_with_history`:

3
docs/advanced-ts.md
View file

@ -1,5 +1,8 @@
# Advanced Usage (TypeScript) # 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 ## Edit Provenance
Track which changes came from where using `reconcileWithHistory`. The result's Track which changes came from where using `reconcileWithHistory`. The result's

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

@ -78,14 +78,20 @@
</p> </p>
<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 <a
href="https://git.schmelczer.dev/andras/reconcile" href="https://git.schmelczer.dev/andras/reconcile"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
>documentation</a >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 - action. Use the tokenisation options to experiment with different approaches -
the Rust library also supports custom tokenisers. the Rust library also supports custom tokenisers.
</p> </p>

4
src/lib.rs
View file

@ -207,7 +207,9 @@
//! //!
//! ## Algorithm overview //! ## 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). //! [README](https://git.schmelczer.dev/andras/reconcile/blob/main/README.md#how-it-works).
mod operation_transformation; mod operation_transformation;