Small bash script to resolve conflicts


(Dominik Schrempf) #1

Hello,

I use Syncthing to sync my configuration files for, e.g., Emacs, Vimperator, etc. When I have more computers running, sync conflicts arise naturally and have to be resolved. Mostly, those conflicts are about changes in configuration files, or bookmarks and so on.

I wanted to announce a small bash script that I wrote to handle sync conflicts in text files similar to the pacdiff utility from Arch Linux. A diff utility can be used to merge the files and keep them up to date.

The source code is available at https://github.com/dschrempf/syncthing-resolve-conflicts.

I appreciate your feedback.

Thanks, Dominik


(Antony Male) #2

Sweet! Add it to the community contributions page in the docs, as well.