That's correct: when the network comes back up we'll present users with a diff view and they can reconcile manually or decide to drop the revision they don't ca

That's correct: when the network comes back up we'll present users with a diff view and they can reconcile manually or decide to drop the revision they don't care about. We're expecting this to be a rare occurrence (during partition, user at site A needs to modify data sourced from B). It doesn't have to be trivially easy for us to recover from, only possible.