Skip to content

Commit a07e103

Browse files
authored
Merge pull request #88 from BuddhiLW/chore/ignore-scratch
chore: ignore .scratch/, union-merge the append-only ledgers
2 parents 07d8c79 + f73b839 commit a07e103

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

‎.gitattributes‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@
88

99
# Keep read-only historical / generated content out of GitHub's language stats.
1010
docs/ja/archive/** linguist-documentation
11+
# Append-only ledgers: parallel branches each add rows at the end, so a union
12+
# merge is the correct resolution (the YAML and ledger gates still check it).
13+
.dev/optimizations.md merge=union
14+
.dev/debt.yaml merge=union

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,6 @@ __pycache__/
5959
# built on demand from jsonsum.go (docs/examples/polyglot/README.md), never
6060
# committed. The C, Zig and Rust guests are a few hundred bytes and are.
6161
docs/examples/polyglot/go/jsonsum.wasm
62+
63+
# Per-worktree ling scratch and resume notes (never committed)
64+
.scratch/

‎.scratch/RESUME.md‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)