https://github.com/dschrempf/syncthing-resolve-conflicts
A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.
https://github.com/dschrempf/syncthing-resolve-conflicts
conflict-resolution syncthing
Last synced: about 2 months ago
JSON representation
A small bash script that handles synchronization conflicts with Syncthing. Inspired by 'pacdiff' from Arch Linux.
- Host: GitHub
- URL: https://github.com/dschrempf/syncthing-resolve-conflicts
- Owner: dschrempf
- License: gpl-3.0
- Created: 2017-02-16T10:17:39.000Z (over 8 years ago)
- Default Branch: master
- Last Pushed: 2025-04-10T09:41:32.000Z (2 months ago)
- Last Synced: 2025-04-10T10:50:00.582Z (2 months ago)
- Topics: conflict-resolution, syncthing
- Language: Shell
- Size: 36.1 KB
- Stars: 93
- Watchers: 8
- Forks: 14
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
- License: LICENSE
Awesome Lists containing this project
README
# Resolve Syncthing synchronization conflicts
A small Bash script that handles synchronization conflicts that necessarily pop
up when using [Syncthing](https://syncthing.net/). Inspired by
[`pacdiff`](https://wiki.archlinux.org/index.php/Pacman/Pacnew_and_Pacsave#Managing_.pacnew_files)
from Arch Linux.
Be careful with recursive conflicts of the form
`.sync-conflict-XXXXXXXX-XXXXXX.sync-conflict-YYYYYYYY-YYYYYY` as they are not
treated in any special way at the moment.
In the following cases, conflicts will be ignored (i.e., not resolved), and
instead, consent is asked for removal:
- files in `/.stversions/` folders;
- non-text files.
```console
(C) + syncthing-resolve-conflicts -h
syncthing-resolve-conflicts v1.2.0
Inspired by 'pacdiff'. A simple program to merge or remove sync conflicts.
'locate' (or 'find', see -f option) is used to find conflicts. In case the
database is not recent, run 'updatedb'.
Usage: syncthing-resolve-conflicts [-d DIR] [-f] [-o] [--nocolor]
General Options:
-d/--directory DIR only scan for sync conflicts in the directory DIR
-f/--find use find instead of locate; by default, scan the home
directory of the current user, but please see the -d
option
-o/--output print files instead of merging them
--nocolor remove colors from output
-v/--version print version and exit
-h/--help print usage and exit
Environment Variables:
DIFFPROG override the merge program: (default: 'vim -d')
Example: DIFFPROG=meld syncthing-resolve-conflicts
Example: syncthing-resolve-conflicts --output
```