feat: Add conflict resolution event types

2026-03-17 22:13:08 +00:00 · 2026-02-18 19:31:09 -08:00
parent 983eb21faa
commit 4ba0026aa1
1 changed files with 2 additions and 0 deletions
--- a/libs/types/src/event.ts
+++ b/libs/types/src/event.ts
@@ -75,6 +75,8 @@ export type EventType =
  | 'merge:success'
  | 'merge:conflict'
  | 'merge:error'
+  | 'conflict:aborted'
+  | 'conflict:resolved'
  | 'branchCommitLog:start'
  | 'branchCommitLog:progress'
  | 'branchCommitLog:done'