Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Can't selectively apply stash #1176

Closed
roblourens opened this issue Nov 18, 2020 · 3 comments
Closed

Can't selectively apply stash #1176

roblourens opened this issue Nov 18, 2020 · 3 comments
Assignees
Labels
bug Something isn't working verified ✔ Verified
Milestone

Comments

@roblourens
Copy link

roblourens commented Nov 18, 2020

  • 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 eamodio self-assigned this Nov 30, 2020
@eamodio eamodio added bug Something isn't working and removed type: potential bug labels Nov 30, 2020
@eamodio eamodio added this to the Soon™ milestone Nov 30, 2020
@eamodio eamodio reopened this Nov 30, 2020
@eamodio
Copy link
Member

eamodio commented Nov 30, 2020

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

You can install the insiders version from here.

@eamodio eamodio added the needs-verification Request for community verification label Nov 30, 2020
@roblourens
Copy link
Author

Looks like it works now, thanks!

@eamodio eamodio added pending-release Resolved but not yet released to the stable edition verified ✔ Verified and removed needs-verification Request for community verification labels Dec 4, 2020
@eamodio eamodio closed this as completed Dec 6, 2020
@eamodio eamodio removed the pending-release Resolved but not yet released to the stable edition label Dec 24, 2020
@eamodio eamodio modified the milestones: Soon™, Shipped Dec 24, 2020
@github-actions
Copy link

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.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working verified ✔ Verified
Projects
None yet
Development

No branches or pull requests

2 participants