fix: remove --delete-branch from mergePR to prevent worktree error (#143)

This commit is contained in:
Jinjing
2026-03-27 12:57:22 -07:00
committed by GitHub
parent a728982a1d
commit 18bc9013d9
+4 -1
View File
@@ -249,7 +249,10 @@ export async function mergePR(
): Promise<{ ok: true } | { ok: false; error: string }> {
await acquire()
try {
await execFileAsync('gh', ['pr', 'merge', String(prNumber), `--${method}`, '--delete-branch'], {
// Don't use --delete-branch: it tries to delete the local branch which
// fails when the user's worktree is checked out on it. Branch cleanup
// is handled by worktree deletion (local) and GitHub's auto-delete setting (remote).
await execFileAsync('gh', ['pr', 'merge', String(prNumber), `--${method}`], {
cwd: repoPath,
encoding: 'utf-8',
env: { ...process.env, GH_PROMPT_DISABLED: '1' }