this post was submitted on 28 Jul 2024
585 points (98.5% liked)

Technology

59329 readers
4634 users here now

This is a most excellent place for technology news and articles.

Our Rules

  1. Follow the lemmy.world rules.
  2. Only tech related content.
  3. Be excellent to each another!
  4. Mod approved content bots can post up to 10 articles per day.
  5. Threads asking for personal tech support may be deleted.
  6. Politics threads may be removed.
  7. No memes allowed as posts, OK to post as comments.
  8. Only approved bots from the list below, to ask if your bot can be added please contact us.
  9. Check for duplicates before posting, duplicates may be removed

Approved Bots

founded 1 year ago
MODERATORS
L3s@lemmy.world
L3s@fry.gs
L4s@fry.gs
L4s@lemmy.world
enu@lemmy.world
585
Google Says Sorry After Passwords Vanish For 15 Million Windows Users. (www.forbes.com)
submitted 3 months ago by ModerateImprovement@sh.itjust.works to c/technology@lemmy.world
185 comments fedilink hide all child comments
you are viewing a single comment's thread
view the rest of the comments
[–] Shatur@lemmy.ml 11 points 3 months ago (2 children)

How did you enable merge conflict resolution for KeePassXC databases?

[–] nekusoul@lemmy.nekusoul.de 2 points 3 months ago* (last edited 3 months ago) (1 children)

Depends a bit on the clients.

  • KeePass: Will ask you if you want to synchronize/overwrite/discard the database when saving.
  • KeePassXC: Will autoreload the database in the background, so merge conflicts shouldn't happen in the first place. Otherwise there's 'Merge database' in the menu.
  • KeePass2Android: So I mixed up the names and this is the client I actually use. This one does all changes to an internal copy of the database that is then synchronized on request.
  • KeePassDX: As far as I can see it also has a mechanism similar too KeePass2Android.

Assuming you only have one desktop and mobile client you should never run into any issues. If you do have multiple KeePassXC clients it's all fine as well assuming Syncthing always has another client it can sync with.

[–] Shatur@lemmy.ml 2 points 3 months ago

Ah, I can do it inside the client, thank you!

[–] PlexSheep@infosec.pub 1 points 3 months ago

By ignoring the conflict files