From 1302e06f75476b98e783ef21794ea1d9bb822ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=82CHES?= Date: Fri, 13 Mar 2026 23:21:14 -0600 Subject: [PATCH] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/resources/extensions/gsd/auto.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/resources/extensions/gsd/auto.ts b/src/resources/extensions/gsd/auto.ts index dd70365cb..d33bc6f00 100644 --- a/src/resources/extensions/gsd/auto.ts +++ b/src/resources/extensions/gsd/auto.ts @@ -1057,11 +1057,12 @@ async function dispatchNextUnit( if (hasMergeHead || hasSquashMsg) { const unmerged = runGit(basePath, ["diff", "--name-only", "--diff-filter=U"], { allowFailure: true }); if (!unmerged || !unmerged.trim()) { - // fix-merge succeeded — finalize the commit if needed (squash case) - if (hasSquashMsg && !hasMergeHead) { + // fix-merge succeeded — finalize the commit if needed (squash or normal merge) + if (hasMergeHead || hasSquashMsg) { try { runGit(basePath, ["commit", "--no-edit"], { allowFailure: false }); - ctx.ui.notify("Fix-merge session succeeded — finalized squash commit.", "info"); + const mode = hasMergeHead ? "merge" : "squash commit"; + ctx.ui.notify(`Fix-merge session succeeded — finalized ${mode}.`, "info"); } catch { // Commit may already exist; non-fatal }