From 2bc5e8d0c82459f1d2adc1cae4f0e74be5381608 Mon Sep 17 00:00:00 2001
From: l0ng-ai <24760907+l0ng-ai@users.noreply.github.com>
Date: Sat, 31 Oct 2026 08:56:37 +0800
Subject: [PATCH] feat(vcs): list Merge and Rebase in the Project view Git menu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds Merge… and Rebase… after Fetch in the Git submenu of the Project view context menu.
---
 src/features/project-tree/contextMenu.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/features/project-tree/contextMenu.ts b/src/features/project-tree/contextMenu.ts
index c5fee7d26..c235dbf4c 100644
--- a/src/features/project-tree/contextMenu.ts
+++ b/src/features/project-tree/contextMenu.ts
@@ -342,6 +342,8 @@ export function contextMenuItems(nodes: ProjectNode[]): MenuItem[] {
           act("vcs.push", undefined, "Push…"),
           act("vcs.update", undefined, "Pull…"),
           act("vcs.fetch", undefined, "Fetch"),
+          act("vcs.merge", undefined, "Merge…"),
+          act("vcs.rebase", undefined, "Rebase…"),
           { kind: "separator" },
           act("vcs.branches", undefined, "Branches…"),
           act("vcs.newBranch", undefined, "New Branch…"),