Steve Yegge 3cf5e26d1e Implement auto-resolution of JSONL merge conflicts during bd sync ...

- Add isInRebase() to detect rebase state
- Add hasJSONLConflict() to check for JSONL-only conflicts
- Add runGitRebaseContinue() to continue rebase after resolution
- Auto-export from DB and resolve conflict when detected
- Add comprehensive tests for auto-resolution logic

Implements bd-cwmt

2025-11-23 20:41:35 -08:00

18 KiB

Raw Blame History

View Raw