Skip to content

docs(users): add ConflictBench to conflict tools #1032

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
rad1092 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

docs(users): add ConflictBench to conflict tools #1032

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
6 changes: 6 additions & 0 deletions users/contrib.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,12 @@ Monitoring
Resolving conflicts
~~~~~~~~~~~~~~~~~~~

- `ConflictBench <https://github.com/rad1092/conflictbench>`_

A local desktop tool for reviewing Syncthing conflicts, choosing which
versions to keep, and saving backups outside synced folders.
Pause Syncthing for the affected folder before applying a reviewed plan.

- `syncthing-resolve-conflicts <https://github.com/dschrempf/syncthing-resolve-conflicts>`_

A small bash script that handles synchronization conflicts in text
Expand Down