Conflict Resolver for Key Upload

[therealpaulgg]

conflict resolution was easily added for download - it should probably be added for upload as well.

This might be a more difficult task to implement as implementing it in a nicer way probably requires some sort of TUI...

[therealpaulgg]

This was elegantly resolved by basically telling the user - hey, we have a newer version of your key on hand (by date). Are you sure you want to upload?

If this does happen, then its likely the user will say no and download again

Practically using this tool it has resolved all my issues. Im not sure we need a "git diff" style resolution conflict system. We're talking about one user, multiple computers, not multiple users and multiple machines.