To minimize the impact of the change, I updated:
diff --git a/g10/import.c b/g10/import.c index 1ed40a63c..345e8cc75 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2955,9 +2955,23 @@ do_transfer (ctrl_t ctrl, kbnode_t keyblock, PKT_public_key *pk, { gpg_error_t err; struct import_stats_s subkey_stats = {0}; + int force = 0; + int already_exist = agent_probe_secret_key (ctrl, pk); + +#ifndef OK_TO_CHANGE_ERROR_BEHAVIOR + if (already_exist == 1) + return gpg_error (GPG_ERR_EEXIST); +#endif + if (already_exist == 2) + { + if (!opt.quiet) + log_info (_("key %s: card reference is overridden by key material\n"), + keystr_from_pk (pk)); + force = 1; + }