fix: Resolve false positive merge conflict detection in auto-import

Browse Source

- Changed from substring matching to standalone line detection
- Only flags actual Git conflict markers on their own lines
- Prevents false alarms from conflict markers in issue descriptions
- Fixes bd-313

Amp-Thread-ID: https://ampcode.com/threads/T-2acdebf1-e4ce-4534-8538-4e7c4fb84232
Co-authored-by: Amp <amp@ampcode.com>

...

This commit is contained in:

Steve Yegge

2025-10-16 12:22:56 -07:00

parent 32a718dacd

commit 91fdaeee1c

2 changed files with 330 additions and 356 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

676

.beads/issues.jsonl

File diff suppressed because one or more lines are too long