singularity/singularity-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(merge): clean stale MERGE_HEAD before squash merge (#2912)

Browse source 
A pre-existing MERGE_HEAD (from failed prior merge, libgit2 native path,
or external tooling) blocks git merge --squash. Remove stale merge state
files before starting the squash merge, not just after.
This commit is contained in:
Jeremy 2026-03-31 17:48:45 -05:00
parent 0e978d4565
commit 2cc01c11ee
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/resources/extensions/gsd/auto-worktree.ts
View file

@ -1566,6 +1566,18 @@ export function mergeMilestoneToMain(
// Non-fatal — proceed with merge; untracked files may block it
}
// 7b. Clean up stale merge state files before starting the squash merge (#2912).
// A previous failed merge, libgit2 native path, or external tooling may leave
// MERGE_HEAD on disk. git refuses to start a new merge when MERGE_HEAD exists,
// causing `git merge --squash` to fail with "You have not concluded your merge".
try {
const gitDir_ = resolveGitDir(originalBasePath_);
for (const f of ["MERGE_HEAD", "MERGE_MSG", "SQUASH_MSG"]) {
const p = join(gitDir_, f);
if (existsSync(p)) unlinkSync(p);
}
} catch { /* best-effort — proceed and let the merge report the error if it fails */ }
// 8. Squash merge — auto-resolve .gsd/ state file conflicts (#530)
const mergeResult = nativeMergeSquash(originalBasePath_, milestoneBranch);