Fix bd-270: Detect and handle Git merge conflicts in JSONL auto-import

Browse Source

- Add pre-parse merge conflict marker detection before JSON parsing
- Show clear error message when conflicts are detected
- Provide resolution instructions (Git client or bd export)
- Add TestAutoImportMergeConflict test case
- Prevents silent auto-import failures from cryptic parse errors

Amp-Thread-ID: https://ampcode.com/threads/T-d83011c0-7dfc-49c9-96c1-05c94ec2a3d3
Co-authored-by: Amp <amp@ampcode.com>

...

This commit is contained in:

Steve Yegge

2025-10-16 00:49:41 -07:00

parent 392379efad

commit 5e420e8ee0

3 changed files with 123 additions and 300 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

319

.beads/issues.jsonl

File diff suppressed because one or more lines are too long