News for hackers. Stuff that matters.
Re:KeePass2 v 2.34 to fix update security problem by Flott on Monday June 06, 2016 @10:46AM (#11847135)
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.
Re:KeePass2 v 2.34 to fix update security problem by brerlapn on Monday June 06, 2016 @03:34PM (#11849635)
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.