diff --git a/users/contrib.rst b/users/contrib.rst index a3ade189..24c843ff 100644 --- a/users/contrib.rst +++ b/users/contrib.rst @@ -266,6 +266,12 @@ Monitoring Resolving conflicts ~~~~~~~~~~~~~~~~~~~ +- `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 `_ A small bash script that handles synchronization conflicts in text