Resolve conflicts: No GitHub repository found for owner (#5961)

Fixes #5945
microsoft · Apr 24, 2024 · 45bbc4e · 45bbc4e
1 parent e84e8be
commit 45bbc4e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/github/folderRepositoryManager.ts b/src/github/folderRepositoryManager.ts
@@ -2163,7 +2163,8 @@ export class FolderRepositoryManager implements vscode.Disposable {
 			}
 			let continueWithMerge = true;
 			if (pullRequest.item.mergeable === PullRequestMergeability.Conflict) {
-				const coordinator = new ConflictResolutionCoordinator(this.telemetry, conflictModel, this.gitHubRepositories.filter(repo => repo.remote.repositoryName === pullRequest.githubRepository.remote.repositoryName));
+				const githubRepos = await Promise.all([this.createGitHubRepositoryFromOwnerName(pullRequest.head!.owner, pullRequest.head!.repositoryCloneUrl.repositoryName), this.createGitHubRepositoryFromOwnerName(pullRequest.base.owner, pullRequest.base.repositoryCloneUrl.repositoryName)]);
+				const coordinator = new ConflictResolutionCoordinator(this.telemetry, conflictModel, githubRepos);
 				continueWithMerge = await coordinator.enterConflictResolutionAndWaitForExit();
 				coordinator.dispose();
 			}