a53e4c1420
- Add section expansion state management with localStorage persistence - Update section headers with chevron toggle controls - Implement conditional task row rendering based on section state - Add Expand All / Collapse All toolbar controls - Add CSS styles for chevron rotation animation and section headers - Add comprehensive tests for collapsible section behavior
971 B
971 B
@dustinbyrne/kb
| @dustinbyrne/kb |
|---|
| minor |
Add smart automatic merge conflict resolution. Lock files, generated files, and trivial whitespace conflicts are now resolved automatically without AI intervention, reducing merge latency and API costs.
New API in @kb/engine:
classifyConflict(filePath, cwd)- returns 'lockfile-ours' | 'generated-theirs' | 'trivial-whitespace' | 'complex'getConflictedFiles(cwd)- list conflicted files via gitresolveWithOurs(filePath, cwd)- resolve using current branchresolveWithTheirs(filePath, cwd)- resolve using incoming branchresolveTrivialWhitespace(filePath, cwd)- resolve whitespace conflictsisTrivialWhitespaceConflict(filePath, cwd)- detect using git diff-tree -w- Exported pattern constants:
LOCKFILE_PATTERNS,GENERATED_PATTERNS
New setting: smartConflictResolution (alias for autoResolveConflicts)
New MergeResult fields: resolutionMethod, autoResolvedCount for tracking resolution paths