Repository navigation
Expand file tree
/
Copy path.gitattributes
More file actions
26 lines (26 loc) · 1.76 KB
/
Copy path.gitattributes
File metadata and controls
26 lines (26 loc) · 1.76 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
# docs/EFFORT-LOG.md is an append-only ledger that every seat writes to, so it conflicts on
# almost every PR. Resolving those by hand is how a seat silently drops another seat's
# rows, which is exactly what happened on 2026-10-04 when the file went from 716 rows to 9.
#
# merge=union takes both sides and concatenates them, so the union a careful agent would
# have written by hand is what git does automatically. A duplicate row is harmless and visible;
# a missing row is not.
docs/EFFORT-LOG.md merge=union
public/tv-face/skins/blue/stills/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/blue/gifs/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/green/stills/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/green/gifs/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/purple/stills/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/purple/gifs/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/pink/stills/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/pink/gifs/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/red/stills/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/red/gifs/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/cyan/stills/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/cyan/gifs/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/yellow/stills/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/yellow/gifs/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/teal/stills/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/teal/gifs/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/coral/stills/** filter=lfs diff=lfs merge=lfs -text
public/tv-face/skins/coral/gifs/** filter=lfs diff=lfs merge=lfs -text