From 4011767f20ee9990f4a3d28d5c024657ddb6d545 Mon Sep 17 00:00:00 2001
From: Dave <futurechimp@users.noreply.github.com>
Date: Thu, 26 Feb 2026 15:07:21 +0000
Subject: [PATCH] Ignoring merge workspace

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index a506026..1d0be17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,8 +11,9 @@ store.json
 # Matrix SDK state store
 .story_kit/matrix_store/
 
-# Agent worktrees (managed by the server, not tracked in git)
+# Agent worktrees and merge workspace (managed by the server, not tracked in git)
 .story_kit/worktrees/
+.story_kit/merge_workspace/
 
 # Coverage reports (generated by cargo-llvm-cov, not tracked in git)
 .story_kit/coverage/