Can't selectively apply stash

[roblourens]

• git stash
• Find the stash in the gitlens view, right click a file, "Apply changes"
• "Unable to apply changes cleanly. Retry and allow conflicts?" - Yes
• "Unable to apply changes. See output channel for more details"
• Log:

[2020-11-18 20:57:40:500] [4a98] GitService.applyChangesToWorkingFile — e=GitUri(file:///Users/roblou/code/vscode-remote-ssh/open-ssh-remote/src/utils/telemetry.ts repoPath=/Users/roblou/code/vscode-remote-ssh sha=5343dcb7ff53367719b3ebc0e9525a15796ffbf7), t=5343dcb7ff53367719b3ebc0e9525a15796ffbf7, i=undefined
[2020-11-18 20:57:40:519] [/Users/roblou/code/vscode-remote-ssh] git diff -M --no-ext-diff -U0 --minimal 5343dcb7ff53367719b3ebc0e9525a15796ffbf7^ 5343dcb7ff53367719b3ebc0e9525a15796ffbf7 -- /Users/roblou/code/vscode-remote-ssh/open-ssh-remote/src/utils/telemetry.ts • 18 ms 
[2020-11-18 20:57:40:535] [/Users/roblou/code/vscode-remote-ssh] git apply --whitespace=warn • 16 ms 
[2020-11-18 20:57:42:320] [/Users/roblou/code/vscode-remote-ssh] git apply --whitespace=warn -3 • 17 ms 
[2020-11-18 20:57:42:320] [4a98] GitService.applyChangesToWorkingFile 
Error: Command failed: /usr/bin/git -c core.quotepath=false -c color.ui=false apply --whitespace=warn -3
error: patch failed: open-ssh-remote/src/utils/telemetry.ts:27
Falling back to three-way merge...
error: patch failed: open-ssh-remote/src/utils/telemetry.ts:27
error: open-ssh-remote/src/utils/telemetry.ts: patch does not apply

There should be no conflicts, I just stashed it

[eamodio]

Can you please verify this fix in the latest insiders version?

You can install the insiders version from here.

[roblourens]

Looks like it works now, thanks!

[github-actions]

This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.