Merge conflict resolution: bd-0io cleanup comment wording

This commit is contained in:
Steve Yegge
2025-11-28 21:50:46 -08:00
parent d4154ca0ab
commit a7db382fda
3 changed files with 520 additions and 82 deletions

View File

@@ -408,12 +408,6 @@ Use --merge to merge the sync branch back to main branch.`,
if err := updateBaseSnapshot(jsonlPath); err != nil {
fmt.Fprintf(os.Stderr, "Warning: failed to update base snapshot: %v\n", err)
}
// Clean up temporary snapshot files after successful merge
sm := NewSnapshotManager(jsonlPath)
if err := sm.Cleanup(); err != nil {
fmt.Fprintf(os.Stderr, "Warning: failed to clean up snapshots: %v\n", err)
}
}
}