The author should sign using the same name and email used for git commits, to avoid the need for corrective `.mailmap` entries. If the commits need changing, they can be fixed before merge using `git commit --amend --author="First Last <email@domain.com>"`.