So close! I think since it's not actually a real conflict the conflict resolution plugin doesn't work. Here's what happens when I try to use the "Resolve Conflict" button.
I've attached the log file, on the off chance you develop that plugin and want to identify why it's happening. Or perhaps it's useful for someone debugging the sync server in the future, but like I said that's mostly a minor annoyance for me. If Laurent is still reading this thread, please consider not logging the cipher text, public, and private keys in the world-readable log file.
log.txt (16.0 KB)
My main request here is still mostly the same: please tell me what notebook the conflicted note is from, so I can put it back there.