Check for conflicts in isUpdateBranchWithGitHubEnabled

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

src/github/pullRequestOverview.ts

@@ -17,6 +17,7 @@ import {
 	ITeam,
 	MergeMethod,
 	MergeMethodsAvailability,
+	PullRequestMergeability,
 	ReviewEventEnum,
 	ReviewState,
 } from './interface';
@@ -221,7 +222,11 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 
 	private isUpdateBranchWithGitHubEnabled(): boolean {
 		// With the GraphQL UpdatePullRequestBranch API, we can update branches even when not checked out
-		// (as long as there are no conflicts). The conflict check is done in updateBranch().
+		// (as long as there are no conflicts). If there are conflicts, we need the branch to be checked out.
+		const hasConflicts = this._item.item.mergeable === PullRequestMergeability.Conflict;
+		if (hasConflicts) {
+			return this._item.isActive;
+		}
 		return true;
 	}