vscode-pull-request-github icon indicating copy to clipboard operation
vscode-pull-request-github copied to clipboard

'Your local changes would be overwritten by checkout' but I don't have local changes

Open roblourens opened this issue 3 years ago • 1 comments

Here's what happened:

  • I had some local changes
  • I checked out out a PR through the extension
  • It was a shallow clone (so I saw a single commit with no history), and I saw this error in the log which is probably from that:
[Debug 1659987519.693s] Unshallowing failed: Failed to execute git {
  "exitCode": 128,
  "gitErrorCode": "DirtyWorkTree",
  "gitCommand": "pull",
  "stdout": "",
  "stderr": "error: Cannot pull with rebase, you have unstaged changes.\nerror: please commit or stash them.\n"
}. Falling back to git pull
  • Opened another PR and saw the same
  • Stashed the changes, so now there are no local changes
  • Trying to open another PR, but I get the warning

I see https://github.com/microsoft/vscode-pull-request-github/issues/2529 but looks like there was no resolution

Full log: 7-GitHub Pull Request.log.zip

After reloading the window, I was able to checkout a PR with no problem.

roblourens avatar Aug 08 '22 19:08 roblourens