Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

'git apply' failed with code 1: patch does not apply error in SourceTree on Stage Hunk

When I attempt to stage a hunk or some lines, I get the following error in SourceTree on OS X:

git apply failed with code 1 patch failed

Staging entire files works fine. The path of this repo lives on a Windows virtual machine running in Parallels.

I suspect a whitespace or newline issue. How do I make this work without reverting to hg-git?

like image 217
Petrus Theron Avatar asked Feb 15 '17 01:02

Petrus Theron


1 Answers

I changed the setting back to 'Show Whitespace' and things seem better.

like image 119
fmpdmb Avatar answered Sep 19 '22 12:09

fmpdmb