Can't apply a patch in GIT?

Question

git

I have a patch that I want to apply.
Accordingly, I enter the command:
git am some-patch.patch
but instead of a successful application, I get:

error: main.py: already exists in index
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: some-patch
Patch failed at some-patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

I tried reverting the file, but it didn't work.

Answer 1

error: main.py: already exists in index
This means that the patch is trying to create main.py, but it already exists in your project.
First delete the extra file, then continue to apply the patch:git am --continue