gsxdsm ddaf73554b feat(KB-010): add autoResolveConflicts setting with intelligent merge conflict resolution ...

- Add autoResolveConflicts setting to types and store (default: true)
- Implement smart conflict detection for lock files and generated files
- Add 3-attempt retry logic with escalating strategies to merger
- Auto-resolve lock files using 'ours', trivial whitespace conflicts
- Track mergeRetries per task for retry loop management
- Update AGENTS.md with conflict resolution documentation
- Add comprehensive merger tests for retry scenarios

2026-03-29 18:27:23 -07:00

..

__tests__

fix(KB-186): add ID-based tiebreaker to sort comparators for stable ordering

2026-03-28 19:40:17 -04:00

board.ts

feat: hai board — core, dashboard, cli, engine

2026-03-25 18:32:10 -04:00

index.ts

feat(KB-004): add GitHub PR creation and comment monitoring

2026-03-29 18:10:35 -07:00

store.test.ts

feat(KB-010): add autoResolveConflicts setting with intelligent merge conflict resolution

2026-03-29 18:27:23 -07:00

store.ts

feat(KB-016): add task duplicate command

2026-03-29 18:22:02 -07:00

types.ts

feat(KB-010): add autoResolveConflicts setting with intelligent merge conflict resolution

2026-03-29 18:27:23 -07:00