3 Commits

Author	SHA1	Message	Date
Dustin Brown	d3ccd5cfba	Fix Dolt backend init/daemon/doctor; prevent accidental SQLite artifacts; add integration tests; clean up lint (#1218) ... * /{cmd,internal}: get dolt backend init working and allow issue creation * /{website,internal,docs,cmd}: integration tests and more split backend fixes * /{cmd,internal}: fix lint issues * /cmd/bd/doctor/integrity.go: fix unable to query issues bug with dolt backend * /cmd/bd/daemon.go: remove debug logging	2026-01-20 17:34:00 -08:00
jane	80cd1f35c0	fix(sync): address code review issues in manual conflict resolution ... Fixes from code review: - Fix duplicate check in merge logic (use else clause) - Handle io.EOF gracefully (treat as quit) - Add quit (q) option to abort resolution early - Add accept-all (a) option to auto-merge remaining conflicts - Fix skipped conflicts to keep local version (not auto-merge) - Handle json.MarshalIndent errors properly - Fix truncateText to use rune count for UTF-8 safety - Update help text with new options - Add UTF-8 and emoji test cases Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-19 11:44:24 -08:00
jane	c99bd00ca7	feat(sync): implement interactive conflict resolution for manual strategy ... Adds interactive manual conflict resolution for `bd sync --resolve --manual`: - Shows field-by-field diff between local and remote versions - Prompts user to choose: local (l), remote (r), merge (m), skip (s) - Supports viewing full JSON diff with 'd' option - Skipped conflicts remain in conflict state for later resolution - Integrates with existing 3-way merge infrastructure New files: - cmd/bd/sync_manual.go: Interactive conflict resolution logic - cmd/bd/sync_manual_test.go: Unit tests for helper functions Closes hq-ew1mbr.28 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2026-01-17 14:02:47 -08:00