From 41b1a2120697b811315d28e53c2d14bda7ab9df6 Mon Sep 17 00:00:00 2001
From: Steve Yegge <stevey@sourcegraph.com>
Date: Thu, 6 Nov 2025 19:14:04 -0800
Subject: [PATCH] Fix bd-rb75: Ignore merge artifacts in .beads/.gitignore

---
 .beads/.gitignore | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .beads/.gitignore

diff --git a/.beads/.gitignore b/.beads/.gitignore
new file mode 100644
index 00000000..05f53505
--- /dev/null
+++ b/.beads/.gitignore
@@ -0,0 +1,24 @@
+# SQLite databases
+*.db
+*.db-journal
+*.db-wal
+*.db-shm
+
+# Daemon runtime files
+daemon.lock
+daemon.log
+daemon.pid
+bd.sock
+
+# Legacy database files
+db.sqlite
+bd.db
+
+# Keep JSONL exports and config (source of truth for git)
+!*.jsonl
+!metadata.json
+!config.json
+
+# Exclude merge artifacts (temporary files from 3-way merge)
+beads.base.jsonl
+beads.left.jsonl