The solution was to simply remove the whole trunk, so everything from the downwards, and it worked immediately.Originally Posted by Lightmagicx13 Line 64 is the last line in the patch file, so the line after. If I just remove the lines itself, it always gives me an error reporting to line 64: fatal: corrupt patch at line 64įatal: Could not apply '.git/ADD_EDIT.patch' diff -git a/pom.xml b/pom.xmlĪnd I wanted to remove the last block with the Mockito-dependency. When patching my pom.xml via git add -e pom.xml, the patch was the following. I just had a similar problem (probably equal due to the workings of git gui) to this, which may be useful to anyone having it as well. This patch will remove empty line and add it again To workaround this just add + line after it:. So this does not work (here is just wihitespace as first character): You change it by whitespace which is trimmed.

Instead it has: -Line with space at end <. This patch will FAIL because the origin file has no line: -Line with space at end<. +Line with no space at end<- Here no space also Your editor will remove trailing space and patch become like this: -Line with space at end<- Here no space. +Line with no space at end<- Here there's no space So, when you save the patch in your editor: -Line with space at end <- NOTICE: Here there is one space at the end It is also possible that your editor has the option: 'Delete spaces at the end of line'. Open your patch and check that all lines you want to leave untouched are started with ' ' (space) When you remove '-' and forget to add ' ' (space) instead of it

Nups patch is corrupt