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

Remove version hardcoding

Browse source
This commit is contained in:
Andras Schmelczer 2026-10-28 10:44:51 +00:00
commit 1b5794bc51
3 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
README.md
View file

@ -1,6 +1,8 @@
# `reconcile-text`: conflict-free 3-way text merging
A Rust, TypeScript, and Python library for merging conflicting text edits without manual intervention. Unlike traditional 3-way merge tools that produce conflict markers, `reconcile-text` automatically resolves conflicts by applying both sets of changes (while updating cursor positions) using an algorithm inspired by Operational Transformation.
Merge a common parent and two edited versions into one text, without conflict markers. `reconcile-text` combines changes from both sides and updates any cursor positions you pass in. It is available as a library for Rust, JavaScript/TypeScript, and Python.
It is built for syncing text files when all you have are snapshots: the document before editing and the two versions it became. The merge needs no saved operation history or persistent document metadata beyond that parent text.
## Try it
@ -24,22 +26,16 @@ For the motivation and algorithm behind the library, read [Conflict-Free Three-W
## Quick start
Each example merges two changes to the same greeting: one side adds a word, while the other changes the greeting itself.
### Rust
Install via crates.io:
Install from [crates.io][crates]:
```sh
cargo add reconcile-text
```
Alternatively, add `reconcile-text` to your `Cargo.toml`:
```toml
[dependencies]
reconcile-text = "0.13.2"
```
Then start merging:
```rust
use reconcile_text::{reconcile, BuiltinTokenizer};

1
scripts/bump-version.sh
View file

@ -39,7 +39,6 @@ which cargo-set-version || cargo install cargo-edit
cargo set-version --bump $1
NEWVER=$(grep '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')
sed_inplace "s/^reconcile-text = \".*\"/reconcile-text = \"$NEWVER\"/" README.md
which wasm-pack || cargo install wasm-pack

6
scripts/lint.sh
View file

@ -2,12 +2,6 @@
set -e
VERSION=$(grep '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')
if ! grep -Fxq "reconcile-text = \"$VERSION\"" README.md; then
echo "README.md must use the Cargo.toml version ($VERSION) in the Rust installation example."
exit 1
fi
which cargo-machete || cargo install cargo-machete
cargo machete