From 8473303213ba4b64952edb79220bd021d0e487d4 Mon Sep 17 00:00:00 2001 From: Alex Ross <38270282+alexr00@users.noreply.github.com> Date: Mon, 26 Jan 2026 18:03:12 +0100 Subject: [PATCH] Remaining Copilot feedback from https://github.com/microsoft/vscode-pull-request-github/pull/8419 --- src/github/pullRequestModel.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/github/pullRequestModel.ts b/src/github/pullRequestModel.ts index 054b6b2218..139cd76255 100644 --- a/src/github/pullRequestModel.ts +++ b/src/github/pullRequestModel.ts @@ -1209,7 +1209,7 @@ export class PullRequestModel extends IssueModel implements IPullRe // For Conflict state, use the REST API approach with conflict resolution. // For Unknown or NotMergeable states, the REST API approach will also be used as a fallback, // though these states may fail for other reasons (e.g., blocked by branch protection). - return this.updateBranchWithConflictResolution(model!); + return this.updateBranchWithConflictResolution(model); } /**