Michael Freno b0ac78c9fc FRE-605: Wire ChangeTracker, MergeLogic and ConflictDetectionAlerts together ...

- Add event emitter to MergeLogic for conflict-detected, conflict-resolved, merge-complete events
- Connect MergeLogic.getLastLocalChange() to ChangeTracker for conflict detection
- Wire ConflictDetectionAlerts component to MergeLogic conflict events
- Add integration tests for full change tracking + merge workflow (8 new tests)
- All 89 tests pass

Co-Authored-By: Paperclip <noreply@paperclip.ing>

2026-04-28 05:17:16 -04:00

..

components

FRE-605: Wire ChangeTracker, MergeLogic and ConflictDetectionAlerts together

2026-04-28 05:17:16 -04:00

db

FRE-588: Consolidate schema - add teams/project_members exports, fix FK references, update seed

2026-04-26 18:17:27 -04:00

hooks

Auto-commit 2026-04-27 19:13

2026-04-27 19:13:03 -04:00

lib

FRE-605: Wire ChangeTracker, MergeLogic and ConflictDetectionAlerts together

2026-04-28 05:17:16 -04:00

pages

Auto-commit 2026-04-27 19:13

2026-04-27 19:13:03 -04:00

routes

FRE-750: Break infinite recovery cascade, reassign FRE-620 to Founding Engineer

2026-04-27 01:22:34 -04:00

styles

FRE-709: Document duplicate recovery wake - FRE-635 already recovered via FRE-708

2026-04-26 20:23:14 -04:00

trpc

Auto-commit 2026-04-27 19:13

2026-04-27 19:13:03 -04:00

App.tsx

feat(FRE-596): add PWA setup and responsive design

2026-04-28 01:48:48 -04:00

index.css

feat(FRE-596): add PWA setup and responsive design

2026-04-28 01:48:48 -04:00

routes.tsx

Auto-commit 2026-04-27 19:13

2026-04-27 19:13:03 -04:00