Cannot merge branch with commits by former employee - Stash/GIT

Question

I'm getting error

remote: ERROR: 4020ffbb63204e7aeb5431f672ac74f8fc929acd has failed hook 'Enforce_Author': 
<USER> not found in Stash!

Any help would be appreciated

Answer 1

It looks like you have some access control mechanisms in place that validate commits authors against current user accounts. You will need to contact the administrator of your Stash instance to work around this feature, or you will need to use something like git filter-branch to rewrite the commits to have a new name/email.

For details on the latter, see the git-filter-branch man page, which includes an example of using the --env-filter option to do rewrite git author and comitter names/emails.