By ignoring the conflict files
Comment on Google Says Sorry After Passwords Vanish For 15 Million Windows Users.
Shatur@lemmy.ml 3 months agoHow did you enable merge conflict resolution for KeePassXC databases?
PlexSheep@infosec.pub 3 months ago
nekusoul@lemmy.nekusoul.de 3 months ago
Depends a bit on the clients.