I use KeePassXC on desktop and Keepass2Android on, well, android, and sync via nextcloud. They all seem to handle syncing correctly, merging changes made on one side, or showing a notification about a conflict, and KeePassXC can definitely merge the two “conflicted copies” together reliably with a couple of clicks (yes, a no-click solution would be better, I know, but it’s not “manual”).
Keepass2Android integrates directly with nextcloud and seems to handle it fine.
The situation can definitely be improved but it’s not so bad for me. Also, two different people should probably use two different database files and not share passwords ;)
Not sure how syncthing handles conflicts, it’s been many years since I tried it.
I use KeePassXC on desktop and Keepass2Android on, well, android, and sync via nextcloud. They all seem to handle syncing correctly, merging changes made on one side, or showing a notification about a conflict, and KeePassXC can definitely merge the two “conflicted copies” together reliably with a couple of clicks (yes, a no-click solution would be better, I know, but it’s not “manual”). Keepass2Android integrates directly with nextcloud and seems to handle it fine.
The situation can definitely be improved but it’s not so bad for me. Also, two different people should probably use two different database files and not share passwords ;)
Not sure how syncthing handles conflicts, it’s been many years since I tried it.