As I haven’t yet found a wiki (with local server) that can sync encrypted (with untrusted online server), I’m now trying to connect several pieces together myself.
I’m looking for a wiki (free/libre & self-hosted) that allows
- syncing with an online location
- resolving of merge conflicts
In case of merge conflicts, it would ideally be possible to see a colored diff within the wiki.
Only the most basic wiki features are needed: editing text, linking pages.