Fix auto merge not updating in create view

Fixes #8195

Author: alexr00

webviews/common/createContextNew.ts

@@ -110,6 +110,8 @@ export class CreatePRContextNew {
 			currentRemote,
 			currentBranch
 		};
+		const startingBaseOwner = this.createParams.baseRemote?.owner;
+		const startingBaseRepo = this.createParams.baseRemote?.repositoryName;
 		const response: ChooseBaseRemoteAndBranchResult = await this.postMessage({
 			command: 'pr.changeBaseRemoteAndBranch',
 			args
@@ -120,14 +122,16 @@ export class CreatePRContextNew {
 			baseBranch: response.baseBranch,
 			createError: ''
 		};
-		if ((this.createParams.baseRemote?.owner !== response.baseRemote.owner) || (this.createParams.baseRemote.repositoryName !== response.baseRemote.repositoryName)) {
+		if ((startingBaseOwner !== response.baseRemote.owner) || (startingBaseRepo !== response.baseRemote.repositoryName)) {
 			updateValues.defaultMergeMethod = response.defaultMergeMethod;
 			updateValues.allowAutoMerge = response.allowAutoMerge;
 			updateValues.mergeMethodsAvailability = response.mergeMethodsAvailability;
 			updateValues.autoMergeDefault = response.autoMergeDefault;
 			updateValues.baseHasMergeQueue = response.baseHasMergeQueue;
 			if (!this.createParams.allowAutoMerge && updateValues.allowAutoMerge) {
 				updateValues.autoMerge = this.createParams.isDraft ? false : updateValues.autoMergeDefault;
+			} else if (this.createParams.allowAutoMerge && !updateValues.allowAutoMerge) {
+				updateValues.autoMerge = false;
 			}
 			updateValues.defaultTitle = response.defaultTitle;
 			if ((this.createParams.pendingTitle === undefined) || (this.createParams.pendingTitle === this.createParams.defaultTitle)) {