Automatically resolve Syncthing conflicts using a three-way mergerafa.ee2 points·nafnlj··1 commentOpen articleSaveView on HN