From f069a76f95dd405ff7a8d3f31062e1c5f9eb3d2a Mon Sep 17 00:00:00 2001 From: Gleb Zakharov Date: Sat, 17 Jan 2026 19:23:36 +0000 Subject: [PATCH] docs: Add `syncthing_merge_babashka` tool to docs/users/contrib.rst Added a new tool for resolving syncthing conflicts. The reason we created it is that syncthing-resolve-conflicts doesn't work with emacsclient well. Also, I was confused a bit with the prompts for the user input --- users/contrib.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/users/contrib.rst b/users/contrib.rst index 1d165972..39ad6805 100644 --- a/users/contrib.rst +++ b/users/contrib.rst @@ -269,6 +269,14 @@ Resolving conflicts `pacdiff` utility from Arch Linux. A diff utility can be used to merge the files and keep them up to date. +- `syncthing_merge_babashka `_ + + A small script written in Clojure and Babashka (and thus requires + Babashka dependency) that helps to resolve conflicts + via emacsclient, vimdiff or other tools. It takes a directory, + finds each conflict and let the user decide whether to open the merge program + or to skip the file. + Older, Possibly Unmaintained ----------------------------