Merging *.kdbx files using KeePassX and KeePass2 Use KeePassXC, either GUI or CLI, as indicated here: https://blog.beardhatcode.be/2018/03/your-own-git-mergetool.html