logoalt Hacker News

63stackyesterday at 5:08 PM0 repliesview on HN

It renames one of them to $hostname_conflicted, or something like that. Keepass has a built in tool for reconciling two databases, you can use that in this scenario.