From a31715c446ca5947d0dfdeaaed875083395b24c1 Mon Sep 17 00:00:00 2001
From: Steve Yegge <stevey@sourcegraph.com>
Date: Sat, 8 Nov 2025 01:53:51 -0800
Subject: [PATCH] Fix .gitignore to exclude git merge driver temp files

Adds patterns for *.json[0-9] and *.jsonl[0-9] to ignore temporary files
created by git merge driver during conflicts (e.g., beads.base.json1)

Amp-Thread-ID: https://ampcode.com/threads/T-afef93f2-e073-47d8-a82e-b8c68412496f
Co-authored-by: Amp <amp@ampcode.com>
---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 10c7bde4..a5758259 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,10 @@ Thumbs.db
 .beads/beads.base.meta.json
 .beads/beads.left.meta.json
 
+# Git merge driver temp files (created during conflicts with numbered extensions)
+.beads/*.json[0-9]
+.beads/*.jsonl[0-9]
+
 # Ignore nix result
 result