Steve Yegge 91fdaeee1c fix: Resolve false positive merge conflict detection in auto-import ...

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

2025-10-16 12:23:14 -07:00

..

bd

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

2025-10-16 12:23:14 -07:00