Hacker News Reader

AFAK if a conflict occure, it will create a "conflicted copy" of the kdbx file. You still have to merge files manually but no data will be lost in the process.

View on HN

This is correct--I've had conflicts and a second kdbx file is created with conflicted copy and the date of the conflict in the filename.

It's a small pain to go through and figure out which item is out of sync, but doable.

Reply on news.ycombinator.com