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
This commit is contained in:
@@ -353,7 +353,6 @@ With --no-db: creates .beads/ directory and issues.jsonl file instead of SQLite
|
||||
|
||||
green := color.New(color.FgGreen).SprintFunc()
|
||||
cyan := color.New(color.FgCyan).SprintFunc()
|
||||
yellow := color.New(color.FgYellow).SprintFunc()
|
||||
|
||||
fmt.Printf("\n%s bd initialized successfully!\n\n", green("✓"))
|
||||
fmt.Printf(" Database: %s\n", cyan(initDBPath))
|
||||
|
||||
Reference in New Issue
Block a user