Skip to content

docs: Add syncthing_merge_babashka tool to docs/users/contrib.rst #984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Snyssfx wants to merge 1 commit into
base: main
Choose a base branch
from
Open

docs: Add syncthing_merge_babashka tool to docs/users/contrib.rst #984

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions users/contrib.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://codeberg.org/snyssfx/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
----------------------------

Expand Down