this post was submitted on 29 Aug 2024
34 points (97.2% liked)

Linux

5237 readers
103 users here now

A community for everything relating to the linux operating system

Also check out !linux_memes@programming.dev

Original icon base courtesy of lewing@isc.tamu.edu and The GIMP

founded 1 year ago
MODERATORS
Ategon@programming.dev
anzo@programming.dev
dwraf_of_ignorance@programming.dev
34
How to show a diff of 2 kdbx Keepass Databases when a sync conflict happens? (self.linux)
submitted 2 months ago* (last edited 2 months ago) by boredsquirrel to c/linux@programming.dev
9 comments fedilink hide all child comments
 

Should be a very common issue

KeepassDX + KeepassXC, Android to Linux.

Synced with Syncthing.

I do a change on the password manager on one device and on another, Android killed Syncthing again so now I have 2 files, one called "sync conflict".

Both files have some new change, I need to keep both.

When using the import feature in KeepassXC, I think everything is duplicated. This would be the best place to do this.

Any idea how to merge them or at least show the diffs?

Displaying all entries, without folders, sorted by date, could also already help.

kinda-solution

In KeepassXC, bottom left, "all entries". Alternatively, search for "*".

Then sort by date.

This helps to compare the most recent changes, and copy them over to the want-to-keep version of the file.

top 9 comments
sorted by: hot top controversial new old
[–] p_consti@lemmy.world 13 points 2 months ago (1 children)

Does "Database > Merge from Database" not work for your case? I remember it helping when I had a similar situation

[–] Vent@lemm.ee 9 points 2 months ago (1 children)

I've used Keepass + Syncthing for many years and this has worked flawlessly every time.

[–] LiveLM@lemmy.zip 6 points 2 months ago (1 children)

For me too, however I would like to get a diff before confirming the merge.

[–] boredsquirrel 2 points 2 months ago

Same. It didnt work some time ago. But I should try this again.

Also if this works on DX, as I am not always with a laptop around

[–] mirkl@programming.dev 3 points 2 months ago (1 children)

I open both dbs and sort all entries by ’modified’

[–] boredsquirrel 2 points 2 months ago

Hm, yes I also had some false positives

[–] fosstian@fosstodon.org 1 points 2 months ago (2 children)

@boredsquirrel KeePassXC can export to CSV format, you could then diff those

[–] boredsquirrel 2 points 2 months ago

True, this would be an okay backup solution!

[–] kinetic_donor@lemmy.zip 1 points 2 months ago

I think you're missing a lot of metadata (last modified, history?) in those files. Haven't checked in a while, though.