Update with merge commitbutton does not go away despite merging (#5702

)

Fixes #5661

src/github/pullRequestOverview.ts

@@ -825,6 +825,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 			return this._replyMessage(message, {});
 		}
 		await this._folderRepositoryManager.tryMergeBaseIntoHead(this._item, true);
+		await this.refreshPanel();
 
 		this._replyMessage(message, {});
 	}

webviews/components/merge.tsx

@@ -246,14 +246,19 @@ export const MergeStatus = ({ mergeable, isSimple, isCurrentlyCheckedOut, canUpd
 
 export const OfferToUpdate = ({ mergeable, isSimple, isCurrentlyCheckedOut, canUpdateBranch }: { mergeable: PullRequestMergeability; isSimple: boolean; isCurrentlyCheckedOut: boolean, canUpdateBranch: boolean }) => {
 	const { updateBranch } = useContext(PullRequestContext);
+	const [isBusy, setBusy] = useState(false);
+	const update = () => {
+		setBusy(true);
+		updateBranch().finally(() => setBusy(false));
+	}
 	if (!canUpdateBranch || !isCurrentlyCheckedOut || isSimple || mergeable === PullRequestMergeability.Behind || mergeable === PullRequestMergeability.Conflict || mergeable === PullRequestMergeability.Unknown) {
 		return null;
 	}
 	return (
 		<div className="status-item status-section">
 			{alertIcon}
 			<p>This branch is out-of-date with the base branch.</p>
-			<button className="secondary" onClick={updateBranch} >Update with merge commit</button>
+			<button className="secondary" onClick={update} disabled={isBusy} >Update with merge commit</button>
 		</div>
 	);