-
Notifications
You must be signed in to change notification settings - Fork 45
Expand file tree
/
Copy path.gitattributes
More file actions
83 lines (72 loc) · 2.44 KB
/
Copy path.gitattributes
File metadata and controls
83 lines (72 loc) · 2.44 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
# Auto detect text files and perform LF normalization
* text=auto
# Source code
*.go text eol=lf
*.md text eol=lf
*.json text eol=lf
*.yml text eol=lf
*.yaml text eol=lf
*.toml text eol=lf
*.sh text eol=lf
*.bash text eol=lf
*.star text eol=lf
*.mdl text eol=lf
*.txt text eol=lf
# TypeScript/JavaScript
*.ts text eol=lf
*.js text eol=lf
*.tsx text eol=lf
*.jsx text eol=lf
# ANTLR4 grammar
*.g4 text eol=lf
*.java text eol=lf
# Makefiles
Makefile text eol=lf
*.mk text eol=lf
# Docker
Dockerfile text eol=lf
*.dockerignore text eol=lf
# Git
.gitignore text eol=lf
.gitattributes text eol=lf
# Documentation
*.typ text eol=lf
# Binary files
*.mpr binary
*.mpk binary
*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.svg binary
*.ico binary
*.vsix binary
*.cdx.json binary
bun.lock binary
# Append-only knowledge files use git's union merge driver.
#
# Every bug fix appends one finding, so two concurrent fixes write to the same
# place. "union" tells git to keep BOTH sides of a conflicting hunk instead of
# raising a conflict, which is exactly right for a file of independent
# line-oriented records where order carries no meaning.
#
# It sits on findings/*.jsonl, NOT on fix-issue.md. It used to cover the whole
# skill file, back when the findings were a Markdown table inside it — and union
# applies file-wide, so two branches editing the same PROSE line would have kept
# both silently. The note that shipped with it said as much and named this fix.
#
# Note what union does NOT do: GitHub's server-side merge does not run merge
# drivers, so a PR still shows the conflict and still has to merge main locally.
# Sharding by area is what actually reduces collisions.
.claude/skills/fix-issue/findings/*.jsonl merge=union
# docs-wiki/SYNC_LOG.md is append-only by its own stated rule ("Append only.
# Never edit historical rows."), so two syncs appending a row each is the same
# situation as two fixes appending a finding. Without this, every parallel wiki
# PR conflicts on one line and the work gets serialised for no reason — which is
# what happened to the five bug-pattern PRs.
docs-wiki/SYNC_LOG.md merge=union
# The wiki's page list. A table and nothing else, in its own file precisely so
# union is safe on it: every sync appends a row, and without this two parallel
# syncs collide on one line. The prose that used to surround it stays in
# maintain-wiki.md, where union would be a hazard rather than a help.
.claude/skills/maintain-wiki/pages.md merge=union