Updater (cmdline): allow to resolve upload conflicts interactively

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Updater (cmdline): allow to resolve update conflicts interactively, too

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>