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
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/advanced-python.md
View file

@ -1,5 +1,8 @@
# 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
Track which changes came from where using `reconcile_with_history`:

3
docs/advanced-ts.md
View file

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