Steve Yegge 5e420e8ee0 Fix bd-270: Detect and handle Git merge conflicts in JSONL auto-import ...

- 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>

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

..

bd-9-child-issues.txt

Fix getNextID bug and design collision resolution (bd-9)

2025-10-12 14:41:58 -07:00

BUG-FOUND-getNextID.md

Fix getNextID bug and design collision resolution (bd-9)

2025-10-12 14:41:58 -07:00

issues.jsonl

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

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