louis_lifu
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle worktree errors (#259106) 

* fix worktree error handling

* remove print statement

* clean up
This commit is contained in:
Christy 😺 2025-07-31 16:38:57 -07:00 committed by GitHub
parent ce135b94c0
commit f58a56ea03
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/git/src/commands.ts
View File

@ -3622,6 +3622,8 @@ export class CommandCenter {
}
private async handleWorktreeConflict(path: string, message: string): Promise<void> {
await this.model.openRepository(path, true);
const worktreeRepository = this.model.getRepository(path);
if (!worktreeRepository) {