Edward Langley
c5e77591d3
issues.jsonl is a passive export whose rows are ordered by insertion, so two sides that file issues collide in the same region even when the issues are disjoint. Git line-merges it and produces conflict markers INSIDE the JSONL, which breaks bd's auto-export silently -- observed today, where a stash-pop left `<<<<<<< Updated upstream` in the file and auto-export was skipping with "invalid character '<'" until the file was regenerated. The driver does no merge logic of its own, because bd already has the semantics: `bd import` skips any row whose updated_at is not strictly newer than the local one, creates ids it has not seen, and keeps the local row on a tie. So importing BOTH sides cannot move the database backwards, and the file is then regenerated from it. The database is the truth; the file is derived. Deliberately not reimplemented here: field-level reconciliation. `bd conflicts show/resolve` already does that against the Dolt working set, which is the real sync path -- a second copy against the text export would have to track bd's schema by hand. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FC2jVn8Au7E9JPkw6bwXXH
2 lines
32 B
Plaintext
2 lines
32 B
Plaintext
.beads/issues.jsonl merge=beads
|