search

awslabs / git-secrets

Prevents you from committing secrets and credentials into git repositories
Apache License 2.0
12.36k stars 1.17k forks source link

Problem with file HEAD.secret #234

Closed bunkiedc closed 1 year ago

bunkiedc commented 1 year ago

Hi. Having an issues with a file that I can't find out anything about. I went back to an older branch to fix a typo in a file. The branch was already committed to the main branch. I did a "pull origin main", unencrypted the files. At the end of unencrypting, I get this message: git secret reveal -P git-secret: abort: cannot find file to decrypt: /home/dave/NewCo/Repos/smart_appliance/<<<<<<< HEAD.secret

Running git secret version: 0.5.0 I have not idea what this is or how to address it. Can you give me a hand?

david

bunkiedc commented 1 year ago

I think I see what's going on. The marker is in the mapping.cfg file showing where the two repos are diverging. I guess the message threw me off as it's not showing the file that's causing the issue.