Add 4px top margin to edit button and include base branch in reply

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

Author: Copilot

src/github/pullRequestOverview.ts

@@ -830,7 +830,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 			if (selectedBranch) {
 				try {
 					await this._item.updateBaseBranch(selectedBranch);
-					await this._replyMessage(message, {});
+					await this._replyMessage(message, { base: selectedBranch });
 				} catch (e) {
 					Logger.error(formatError(e), PullRequestOverviewPanel.ID);
 					vscode.window.showErrorMessage(vscode.l10n.t('Changing base branch failed. {0}', formatError(e)));

webviews/common/context.tsx

@@ -92,7 +92,12 @@ export class PRContext {
 	public readyForReviewAndMerge = (args: { mergeMethod: MergeMethod }): Promise<ReadyForReview> => this.postMessage({ command: 'pr.readyForReviewAndMerge', args });
 
 	public addReviewers = () => this.postMessage({ command: 'pr.change-reviewers' });
-	public changeBaseBranch = () => this.postMessage({ command: 'pr.change-base-branch' });
+	public changeBaseBranch = async () => {
+		const result = await this.postMessage({ command: 'pr.change-base-branch' });
+		if (result?.base) {
+			this.updatePR({ base: result.base });
+		}
+	};
 	public changeProjects = (): Promise<ProjectItemsReply> => this.postMessage({ command: 'pr.change-projects' });
 	public removeProject = (project: IProjectItem) => this.postMessage({ command: 'pr.remove-project', args: project });
 	public addMilestone = () => this.postMessage({ command: 'pr.add-milestone' });

webviews/editorWebview/index.css

@@ -541,6 +541,10 @@ body button .icon {
 	border-radius: 4px;
 }
 
+.merge-branches .icon-button {
+	margin-top: 4px;
+}
+
 .subtitle .created-at {
 	margin-left: auto;
 	white-space: nowrap;