wilderjds
/
syncthing-resolve-conflicts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
19 Commits
1 Branch
0 Tags
426 KiB
 
Tag: Branch: Tree: 216f2a5c05
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '216f2a5c05'
${ noResults }
Go to file
Dominik Schrempf 216f2a5c05
Cosmetic change. 		8 years ago
LICENSE Initial commit 9 years ago
README.md Actually change the executable name and documentation 9 years ago
syncthing-resolve-conflicts Cosmetic change. 8 years ago

README.md

Resolve sync conflicts

A small bash script that handles synchronization conflicts that necessarily pop up when using Syncthing. Inspired by pacdiff from Arch Linux.

Be careful with recursive conflicts of the form .sync-conflict-XXXXXXXX-XXXXXX.sync-conflict-YYYYYYYY-YYYYYY as they are not handled in any special way at the moment.

Files in /.stversions/ folders will be ignored and consent is asked for removal.

Non-text files are ignored at the moment and can be removed one by one if desired.

syncthing-resolve-conflicts v1.0.0

Inspired by 'pacdiff'.
A simple program to merge or remove sync conflicts.
Locate is used to find conflicts.
In case the database is not recent, run 'updatedb'.

Usage: syncthing-resolve-conflicts [-o] [--nocolor]

General Options:
  -o/--output       print files instead of merging them
  --nocolor         remove colors from output

Environment Variables:
  DIFFPROG          override the merge program: (default: 'vim -d')

Example: DIFFPROG=meld syncthing-resolve-conflicts
Example: syncthing-resolve-conflicts --output