From a728982a1d1e32106739cc355ec142af266bde2f Mon Sep 17 00:00:00 2001
From: Jinjing <6427696+AmethystLiang@users.noreply.github.com>
Date: Fri, 27 Mar 2026 12:49:17 -0700
Subject: [PATCH] fix: Add --yes flag to gh pr merge command (#142)

* fix: squash and merge issue

- fix: squash and merge issue

* fix: use GH_PROMPT_DISABLED instead of invalid --yes flag
---
 src/main/github/client.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/github/client.ts b/src/main/github/client.ts
index 8a1c1b3d891..055db10d1fd 100644
--- a/src/main/github/client.ts
+++ b/src/main/github/client.ts
@@ -251,7 +251,8 @@ export async function mergePR(
   try {
     await execFileAsync('gh', ['pr', 'merge', String(prNumber), `--${method}`, '--delete-branch'], {
       cwd: repoPath,
-      encoding: 'utf-8'
+      encoding: 'utf-8',
+      env: { ...process.env, GH_PROMPT_DISABLED: '1' }
     })
     return { ok: true }
   } catch (err) {