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

Fix links
Some checks failed
Check / build (push) Has been cancelled
Details
Publish / build (push) Failing after 11m0s
Details
Publish / publish-crate (push) Has been cancelled
Details
Publish / publish-npm (push) Has been cancelled
Details
Publish / publish-pypi (push) Has been cancelled
Details

Browse source
This commit is contained in:
Andras Schmelczer 2026-10-29 00:01:02 +00:00
commit 6a244ac909
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

@ -181,13 +181,13 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
[crates]: https://crates.io/crates/reconcile-text [crates]: https://crates.io/crates/reconcile-text
[npm]: https://www.npmjs.com/package/reconcile-text [npm]: https://www.npmjs.com/package/reconcile-text
[pypi]: https://pypi.org/project/reconcile-text/ [pypi]: https://pypi.org/project/reconcile-text/
[rust-merge-file]: examples/merge-file.rs [rust-merge-file]: https://git.schmelczer.dev/andras/reconcile/src/branch/main/examples/merge-file.rs
[rust-docs]: https://docs.rs/reconcile-text/latest/reconcile_text/ [rust-docs]: https://docs.rs/reconcile-text/latest/reconcile_text/
[typescript-guide]: docs/advanced-ts.md [typescript-guide]: https://git.schmelczer.dev/andras/reconcile/src/branch/main/docs/advanced-ts.md
[demo-source]: examples/website/src/index.ts [demo-source]: https://git.schmelczer.dev/andras/reconcile/src/branch/main/examples/website/src/index.ts
[binaryen]: https://github.com/WebAssembly/binaryen [binaryen]: https://github.com/WebAssembly/binaryen
[python-merge-file]: examples/merge_file.py [python-merge-file]: https://git.schmelczer.dev/andras/reconcile/src/branch/main/examples/merge_file.py
[python-guide]: docs/advanced-python.md [python-guide]: https://git.schmelczer.dev/andras/reconcile/src/branch/main/docs/advanced-python.md
[diff3]: https://blog.jcoglan.com/2017/05/08/merging-with-diff3/ [diff3]: https://blog.jcoglan.com/2017/05/08/merging-with-diff3/
[operational-transform-rs]: https://github.com/spebern/operational-transform-rs [operational-transform-rs]: https://github.com/spebern/operational-transform-rs
[loro]: https://github.com/loro-dev/loro [loro]: https://github.com/loro-dev/loro
@ -195,10 +195,10 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
[automerge]: https://github.com/automerge/automerge [automerge]: https://github.com/automerge/automerge
[git-merge-drivers]: https://git-scm.com/docs/gitattributes#_built_in_merge_drivers [git-merge-drivers]: https://git-scm.com/docs/gitattributes#_built_in_merge_drivers
[diff-match-patch]: https://github.com/google/diff-match-patch [diff-match-patch]: https://github.com/google/diff-match-patch
[comparison-example]: examples/compare-with-diff-match-patch.rs [comparison-example]: https://git.schmelczer.dev/andras/reconcile/src/branch/main/examples/compare-with-diff-match-patch.rs
[yjs]: https://github.com/yjs/yjs [yjs]: https://github.com/yjs/yjs
[ot-js]: https://github.com/Operational-Transformation/ot.js [ot-js]: https://github.com/Operational-Transformation/ot.js
[uv]: https://docs.astral.sh/uv/getting-started/installation/ [uv]: https://docs.astral.sh/uv/getting-started/installation/
[nvm]: https://github.com/nvm-sh/nvm [nvm]: https://github.com/nvm-sh/nvm
[rustup]: https://rustup.rs [rustup]: https://rustup.rs
[license]: ./LICENSE [license]: https://git.schmelczer.dev/andras/reconcile/src/branch/main/LICENSE

2
src/lib.rs
View file

@ -212,7 +212,7 @@
//! For the motivation and algorithm behind the library, read //! For the motivation and algorithm behind the library, read
//! [Conflict-Free Three-Way Text Merging](https://schmelczer.dev/articles/reconcile-text-3-way-merge/). //! [Conflict-Free Three-Way Text Merging](https://schmelczer.dev/articles/reconcile-text-3-way-merge/).
//! For a shorter overview, see the //! 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/src/branch/main/README.md#how-it-works).
mod operation_transformation; mod operation_transformation;
mod raw_operation; mod raw_operation;