If you updated KeePass data on two machines, in a non-conflicting way (e.g. added two different logins), is there a good way to merge these changes during synchronization?
I don't know about Keepass, but you can do that with KeepassXC, which has a "Database > Merge from database..." option. There is also the Keeshare [0] feature to share some/all entries between databases
