gala8y
solarkraft
/ syncthing-automerge.py
Last active
March 18, 2025 17:08
Monitors a Syncthing-synced directory and tries to merge conflicting files (based on https://www.rafa.ee/articles/resolve-syncthing-conflicts-using-three-way-merge/). Probably adaptable for other directory types, but only tested with Logseq (works for me™️).
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # This script automatically handles Syncthing conflicts on text files by applying a | |
| # git three-way merge between the previously synced version and each divergent version. | |
| # It depends on the watchdog package and git. | |
| # For automatic dependency installation when running with ´uv run --script deconflicter.py´: | |
| # /// script | |
| # requires-python = ">=3.10" | |
| # dependencies = [ | |
| # "watchdog", |