git: patch does not apply

Question

I have a certain patch called my_pcc_branch.patch.

When I try to apply it, I get the following message:

$ git apply --check my_pcc_branch.patch

warning: src/main/java/.../AbstractedPanel.java has type 100644, expected 100755

error: patch failed: src/main/java/.../AbstractedPanel.java:13

error: src/main/java/.../AbstractedPanel.java: patch does not apply

What does it mean?

How can I fix this problem?

Answer 1

To resolve this error you could use:

git apply --ignore-space-change --ignore-whitespace mychanges.patch

This will resolve your issue and for more information regarding this command.

Refer: https://git-scm.com/docs/git-apply#Documentation/git-apply.txt---ignore-space-change