3 ms·Automatically resolve Syncthing conflicts using a three-way merge2 points by nafnlj 5y agomrjin 5y agoHmmm, good luck with that.