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

Question

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

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?

same here. Arrives 'from time to time' without a rule. OSX 10.12.5 with Xcode 8.3 — heimi, Jul 07 '17 at 13:35

score 5 · Answer 1 · answered Jul 10 '17 at 17:32

5

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

answered Jul 10 '17 at 17:32

fmpdmb

1

Actually, the fix for me was the opposite: setting it to '_Ignore whitespace_' would solve the patching issue. – Cœur Sep 02 '19 at 07:51
3

Doesn't fix the issue for me, neither option. – Mote Zart Aug 24 '20 at 15:09
1

This fixed it for me today. 4 years after both the question and answer... Great job Atlassian – Stuart Kemp Apr 28 '21 at 13:01

1 Answers1