Files
beads/cmd/bd
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
..
2025-11-09 14:53:59 -08:00
2025-11-09 14:53:59 -08:00
2025-11-17 10:12:46 -07:00
2025-11-21 19:01:42 -05:00
2025-11-22 00:11:45 -08:00
2025-11-23 17:16:27 -08:00