From 41e54a9460ae7fcc61019339384a175119e08443 Mon Sep 17 00:00:00 2001
From: Gavriel Cohen <gabicohen22@yahoo.com>
Date: Fri, 20 Feb 2026 15:13:52 +0200
Subject: [PATCH] fix: pass filePath in setupRerereAdapter stale MERGE_HEAD
 cleanup

cleanupMergeState() without a filePath runs bare `git reset`, which
resets the entire index and can stage deletions of unrelated files.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 skills-engine/merge.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skills-engine/merge.ts b/skills-engine/merge.ts
index b293791..44da4db 100644
--- a/skills-engine/merge.ts
+++ b/skills-engine/merge.ts
@@ -58,7 +58,7 @@ export function setupRerereAdapter(
 
   // Clean up stale MERGE_HEAD from a previous crash
   if (fs.existsSync(path.join(gitDir, 'MERGE_HEAD'))) {
-    cleanupMergeState();
+    cleanupMergeState(filePath);
   }
 
   // Hash objects into git object store