[tux3]

Git conflict resolution isn't great, but it's also not much worse than MediaWiki's existing conflict resolution today.

It doesn't matter all that much whether your servers are federated or served from a single domain, the time users spend with the page editor open is much longer than the latency of a federation request. A server somewhere might be horribly out of sync and cause a lot of conflicts, but presumably those are also the scuffy servers with low traffic that don't see a lot of edits per minute anyways.

CRDT is cool, but it's deploying a very shiny new tech for a small problem that doesn't really need anything fancy.