From 6d56177ca88fac32c9cdcb0d5d7fe928888a3077 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sun, 6 Jul 2025 13:03:31 +0100 Subject: [PATCH] Improve --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b7c0c2b..f54d845 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,16 @@ # Reconcile: conflict-free 3-way text merging -> [`diff3`](https://www.gnu.org/software/diffutils/manual/html_node/Invoking-diff3.html) but with automatic conflict resolution. - [![Check](https://github.com/schmelczer/reconcile/actions/workflows/check.yml/badge.svg)](https://github.com/schmelczer/reconcile/actions/workflows/check.yml) [![Publish to GitHub Pages](https://github.com/schmelczer/reconcile/actions/workflows/gh-pages.yml/badge.svg)](https://github.com/schmelczer/reconcile/actions/workflows/gh-pages.yml) -TODO: add links for crates and npm +> [`diff3`](https://www.gnu.org/software/diffutils/manual/html_node/Invoking-diff3.html) (or `git merge`) but with automatic conflict resolution. Reconcile is a Rust and JavaScript (through WebAssembly) library for merging text without user intervention. It automatically resolves conflicts that would typically require user action in traditional 3-way merge tools. +Try out the [interactive demo](https://schmelczer.dev/reconcile)! + +TODO: add links for crates and npm + ## Features - **Conflict-free output** - No more git conflict markers in the result