-
Notifications
You must be signed in to change notification settings - Fork 40
Expand file tree
/
Copy path.gitattributes
More file actions
26 lines (22 loc) · 1.41 KB
/
Copy path.gitattributes
File metadata and controls
26 lines (22 loc) · 1.41 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
# Use bd merge for beads JSONL files
.beads/issues.jsonl merge=beads
# Keep executable scripts runnable when cloned on Windows.
*.sh text eol=lf
# Generated/derived artifacts — union-merge to kill textual re-conflicts during
# multi-PR drains (their canonical content is restored by scripts/regen-all.sh).
# Council 2026-06-06 (ag-bdg1). NOTE: cli/embedded/** is //go:embed'd and
# skills-codex/** ships in the tarball — they MUST stay committed; union-merge
# only avoids spurious conflict markers, regen produces the authoritative bytes.
registry.json merge=union
**/.agentops-generated.json merge=union
skills-codex/.agentops-manifest.json merge=union
docs/contracts/context-map.md merge=union
cli/docs/COMMANDS.md merge=union
# Tracked runtime JSONL logs (next-work, findings/registry, provenance ledger) are
# DELIBERATELY NOT union-merged (age-uqj). They are not pure append-logs: next-work
# entries are rewritten in place (markEntryConsumed / markItemConsumedOwned flip
# consumed/claim_status) and the ledger is a prev_hash chain — union-merge would
# either resurrect consumed/claimed work or break the chain. A genuine divergence
# on these files must surface as a real conflict, not be silently merged. The
# "git pull --rebase fails on dirty runtime logs" friction is fixed instead by the
# repo-local rebase.autoStash set in scripts/install-pre-push-gate.sh.