Clean up

Author: alexr00

src/github/folderRepositoryManager.ts

@@ -2453,11 +2453,8 @@ export class FolderRepositoryManager extends Disposable {
 		}
 
 		const isBrowser = (vscode.env.appHost === 'vscode.dev' || vscode.env.appHost === 'github.dev');
-		const hasNoConflicts = pullRequest.item.mergeable === PullRequestMergeability.Mergeable || pullRequest.item.mergeable === PullRequestMergeability.Behind;
 
-		// Use GraphQL API when PR is not checked out, in browser, or when there are no conflicts
-		// The GraphQL API is simpler and more efficient for conflict-free updates
-		if (!pullRequest.isActive || isBrowser || hasNoConflicts) {
+		if (!pullRequest.isActive || isBrowser) {
 			const conflictModel = await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification, title: vscode.l10n.t('Finding conflicts...') }, () => createConflictResolutionModel(pullRequest));
 			if (conflictModel === undefined) {
 				await vscode.window.showErrorMessage(vscode.l10n.t('Unable to resolved conflicts for this pull request. There are too many file changes.'), { modal: true, detail: isBrowser ? undefined : vscode.l10n.t('Please check out the pull request to resolve conflicts.') });
@@ -2472,18 +2469,27 @@ export class FolderRepositoryManager extends Disposable {
 			}
 
 			if (continueWithMerge) {
-				const updateSucceeded = await pullRequest.updateBranch(conflictModel);
-				// If the PR is currently checked out and update succeeded via GraphQL (no conflicts), pull to sync local branch
-				// When there are conflicts (REST API path), the update already pushes the changes, so no pull is needed
-				if (updateSucceeded && pullRequest.isActive && !isBrowser && hasNoConflicts) {
-					await this.repository.pull();
-				}
-				return updateSucceeded;
+				return pullRequest.updateBranch(conflictModel);
 			} else {
 				return false;
 			}
 		}
 
+		if (pullRequest.item.mergeable !== PullRequestMergeability.Conflict) {
+			const result = await vscode.window.withProgress(
+				{ location: vscode.ProgressLocation.Notification, title: vscode.l10n.t('Updating branch...') },
+				async () => {
+					const success = await pullRequest.updateBranchWithGraphQL();
+					if (success && pullRequest.isActive) {
+						await this.repository.pull();
+					}
+					return success;
+				}
+			);
+			return result;
+		}
+
+
 		if (this.repository.state.workingTreeChanges.length > 0 || this.repository.state.indexChanges.length > 0) {
 			await vscode.window.showErrorMessage(vscode.l10n.t('The pull request branch cannot be updated when the there changed files in the working tree or index. Stash or commit all change and then try again.'), { modal: true });
 			return false;
@@ -3063,7 +3069,7 @@ export const byRemoteName = (name: string): Predicate<GitHubRepository> => ({ re
 /**
  * Unwraps lines that were wrapped for conventional commit message formatting (typically at 72 characters).
  * Similar to GitHub's behavior when converting commit messages to PR descriptions.
- * 
+ *
  * Rules:
  * - Preserves blank lines as paragraph breaks
  * - Preserves fenced code blocks (```)

src/github/pullRequestModel.ts

@@ -1202,30 +1202,21 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 	}
 
 	async updateBranch(model: ConflictResolutionModel): Promise<boolean> {
-		if (this.item.mergeable === PullRequestMergeability.Conflict && (!model.resolvedConflicts || model.resolvedConflicts.size === 0)) {
+		if (!model.resolvedConflicts || model.resolvedConflicts.size === 0) {
 			throw new Error('Pull Request has conflicts but no resolutions were provided.');
 		}
-
 		Logger.debug(`Updating branch ${model.prHeadBranchName} to ${model.prBaseBranchName} - enter`, GitHubRepository.ID);
-
-		// When there are no conflicts, use the GitHub GraphQL API's UpdatePullRequestBranch mutation.
-		// This is simpler and more efficient than manually creating trees and commits.
-		// The GraphQL API is suitable for Mergeable and Behind states, which can be cleanly updated.
-		if (this.item.mergeable === PullRequestMergeability.Mergeable || this.item.mergeable === PullRequestMergeability.Behind) {
-			return this.updateBranchWithGraphQL();
-		}
-
 		// 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!);
 	}
 
 	/**
 	 * Update the branch using the GitHub GraphQL API's UpdatePullRequestBranch mutation.
 	 * This is used when there are no conflicts between the head and base branches.
 	 */
-	private async updateBranchWithGraphQL(): Promise<boolean> {
+	public async updateBranchWithGraphQL(): Promise<boolean> {
 		Logger.debug(`Updating branch using GraphQL UpdatePullRequestBranch mutation - enter`, GitHubRepository.ID);
 
 		if (!this.head?.sha) {