Intelligent 3-way text merging with automated conflict resolution
schmelczer.dev/reconcile/
schmelczer/reconcile