Jakob Borg

More than simply something like `find . -name \*sync-conflict\*`?

Meld looks like some interactive merge tool? How would syncthing use it to resolve conflicts? Or are you suggesting running an external tool of some sort (meld) to automatically resolve...

We could, but not an interactive one. But i could see running a command for conflict handling, much like the external versioning. If that command merges, picks the newest file...

The fact that there's a 20 year old paper on implementing it in distributed file systems, but that noone notable has actually done that since speaks volumes to me. ;)

For the record, option 2 exists in the `maxConflicts=0` setting.

LZ4 package bug: https://github.com/pierrec/lz4/pull/191

Yeah. One "worry" is that we don't have a process for keeping dependencies locked at a lower version; dependabot will complain, `build.sh update-deps` will upgrade it, etc... It might be...

I guess by whoever wants to be the new maintainer of the lz4 package in perpetuity...

Since it's a server, letting the clients connect to it via hostname or (static) IP might also be an option.

Is .stwritetest something the android app does?