From 234ae1f68b6debc5095d286cec2336e7bd1b280c Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sat, 19 Sep 2026 15:02:27 +0100 Subject: [PATCH 1/2] Migrate to forgejo --- Cargo.toml | 2 +- examples/website/package.json | 6 +++--- examples/website/src/index.html | 6 +++--- reconcile-js/package.json | 4 ++-- reconcile-python/pyproject.toml | 4 ++-- src/lib.rs | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 21ff69b..bce734f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ authors = ["Andras Schmelczer "] edition = "2024" license = "MIT" readme = "README.md" -repository = "https://github.com/schmelczer/reconcile" +repository = "https://git.schmelczer.dev/andras/reconcile" homepage = "https://schmelczer.dev/reconcile" keywords = ["merge", "OT", "CRDT", "3-way", "diff"] categories = ["wasm", "text-processing", "text-editors", "algorithms", "data-structures"] diff --git a/examples/website/package.json b/examples/website/package.json index 9a16f32..6f83087 100644 --- a/examples/website/package.json +++ b/examples/website/package.json @@ -9,18 +9,18 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/schmelczer/reconcile.git" + "url": "git+https://git.schmelczer.dev/andras/reconcile.git" }, "keywords": [], "author": "Andras Schmelczer", "license": "GPL-3.0-or-later", "bugs": { - "url": "https://github.com/schmelczer/reconcile/issues" + "url": "https://git.schmelczer.dev/andras/reconcile/issues" }, "browserslist": [ "defaults" ], - "homepage": "https://github.com/schmelczer/reconcile#readme", + "homepage": "https://git.schmelczer.dev/andras/reconcile#readme", "devDependencies": { "copy-webpack-plugin": "^14.0.0", "css-loader": "^7.1.4", diff --git a/examples/website/src/index.html b/examples/website/src/index.html index e6b98c3..ae5ab04 100644 --- a/examples/website/src/index.html +++ b/examples/website/src/index.html @@ -49,7 +49,7 @@ (or more specifically, git merge), but with intelligent conflict resolution that requires no user intervention. The reconcile-text Ready to dive deeper? Check out the documentation ", diff --git a/reconcile-python/pyproject.toml b/reconcile-python/pyproject.toml index b3b16e7..45a1c4b 100644 --- a/reconcile-python/pyproject.toml +++ b/reconcile-python/pyproject.toml @@ -25,8 +25,8 @@ dev = ["maturin>=1.0,<2.0", "pytest>=8", "ruff>=0.15", "pyright>=1"] [project.urls] Homepage = "https://schmelczer.dev/reconcile" -Repository = "https://github.com/schmelczer/reconcile" -Issues = "https://github.com/schmelczer/reconcile/issues" +Repository = "https://git.schmelczer.dev/andras/reconcile" +Issues = "https://git.schmelczer.dev/andras/reconcile/issues" [tool.maturin] manifest-path = "Cargo.toml" diff --git a/src/lib.rs b/src/lib.rs index f200340..7e86f90 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -208,7 +208,7 @@ //! ## Algorithm overview //! //! For detailed algorithm explanation, see the -//! [README](https://github.com/schmelczer/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 raw_operation; From 6bf7d9c5fe108102611b8671aa51991c11c944a5 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sat, 19 Sep 2026 15:03:10 +0100 Subject: [PATCH 2/2] Add blog --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b644077..ac1901a 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ 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! + ### Install it in your project - `cargo add reconcile-text` ([reconcile-text on crates.io][9])