Handle worktree errors (microsoft#259106)

nguyenchristy · web-flow · commit f58a56ea034f · 2025-07-31T16:38:57.000-07:00
* fix worktree error handling

* remove print statement

* clean up
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -3622,6 +3622,8 @@ export class CommandCenter {`
`3622`	`3622`	`}`
`3623`	`3623`
`3624`	`3624`	`private async handleWorktreeConflict(path: string, message: string): Promise<void> {`
	`3625`	`+ await this.model.openRepository(path, true);`
	`3626`	`+`
`3625`	`3627`	`const worktreeRepository = this.model.getRepository(path);`
`3626`	`3628`
`3627`	`3629`	`if (!worktreeRepository) {`