Apply Changes not working because of whitespace conflicts

[tiansin]

• GitLens Version: 9.02
• VSCode Version: 1.2.9
• OS Version: mac 10.13.6

Steps to Reproduce:

This feature is not available for both the repository and submodules

[eamodio]

Can you provide more details and steps for what you are seeing?

[tiansin]

@eamodio Always prompt this, choose Yes.

[eamodio]

So when you say Yes it doesn't apply the changes to the working tree?

[tiansin]

`
[2018-12-12 09:13:18:971] git — -c, core.quotepath=false, -c, color.ui=false, apply, cwd='/Users/xxxx/xxxx/xxxx/xxx/src/app/Services'

Error: :33: trailing whitespace.
* @param url
error: patch failed: Public/plat.class.ts:5
error: Public/plat.class.ts: patch does not apply

[2018-12-12 09:13:20:734] git — -c, core.quotepath=false, -c, color.ui=false, apply, -3, cwd='/Users/xxxx/xxxx/xxxx/xxx/src/app/Services'

Error: :33: trailing whitespace.
* @param url
error: patch failed: Public/plat.class.ts:5
Falling back to three-way merge...
error: patch failed: Public/plat.class.ts:5
error: Public/plat.class.ts: patch does not apply

[2018-12-12 09:13:20:734] Object
Error: :33: trailing whitespace.
* @param url
error: patch failed: Public/plat.class.ts:5
Falling back to three-way merge...
error: patch failed: Public/plat.class.ts:5
error: Public/plat.class.ts: patch does not apply
`

@eamodio

[eamodio]

On the command line what happens if you run:
git apply --whitespace=warn -3

[tiansin]

@eamodio This error appears again here.