johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix .gitignore to exclude git merge driver temp files

Browse Source 
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>
This commit is contained in:
Steve Yegge
2025-11-08 01:53:51 -08:00
parent 7d5ea2e6c9
commit a31715c446
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -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