Y
Hacker News
new
|
ask
|
show
|
jobs
by
63stack
60 days ago
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.