Linux

5237 readers

107 users here now

A community for everything relating to the linux operating system

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

founded 1 year ago

MODERATORS

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.

you are viewing a single comment's thread
view the rest of the comments

[–] 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